[SCM] deadbeef/master: Imported Upstream version 0.6.2
mati75-guest at users.alioth.debian.org
mati75-guest at users.alioth.debian.org
Sat Aug 9 15:02:20 UTC 2014
Imported Upstream version 0.6.2
Imported Upstream version 0.6.0
Imported Upstream version 0.6.0-rc2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d9be6d3e5847ec41a36ad06d503c032d67963709
X-Git-Newrev: dd6ec13851e8fb9620d1dc99c780161a0cbc5435
The following commit has been merged in the master branch:
commit c5651fb8f6d18911690211aee85ff2ec72e0c3e0
Merge: d9be6d3e5847ec41a36ad06d503c032d67963709 123de8361eaf240057f334ddae1961dd92078d9a
Author: Mateusz Åukasik <mati75 at linuxmint.pl>
Date: Sat Aug 9 17:01:03 2014 +0200
Imported Upstream version 0.6.2
diff --combined Makefile.in
index ab19b98,59b5359..ad68be3
--- a/Makefile.in
+++ b/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -18,23 -17,51 +21,71 @@@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -55,13 -82,13 +106,13 @@@ build_triplet = @build
host_triplet = @host@
bin_PROGRAMS = deadbeef$(EXEEXT)
subdir = .
- DIST_COMMON = README $(am__configure_deps) $(sdk_HEADERS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(srcdir)/deadbeef.desktop.in \
- $(top_srcdir)/configure $(top_srcdir)/intl/Makefile.in \
- ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS compile \
- config.guess config.rpath config.sub depcomp install-sh \
- ltmain.sh missing
+ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in $(top_srcdir)/intl/Makefile.in \
+ $(srcdir)/deadbeef.desktop.in ABOUT-NLS depcomp $(sdk_HEADERS) \
+ COPYING compile config.guess config.rpath config.sub \
+ install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -101,33 -128,59 +152,69 @@@ am_deadbeef_OBJECTS = main.$(OBJEXT) pl
junklib.$(OBJEXT) utf8.$(OBJEXT) vfs.$(OBJEXT) \
vfs_stdio.$(OBJEXT) md5.$(OBJEXT) metacache.$(OBJEXT) \
ringbuf.$(OBJEXT) dsppreset.$(OBJEXT) replaygain.$(OBJEXT) \
- fft.$(OBJEXT) handler.$(OBJEXT)
+ fft.$(OBJEXT) handler.$(OBJEXT) escape.$(OBJEXT)
deadbeef_OBJECTS = $(am_deadbeef_OBJECTS)
am__DEPENDENCIES_1 =
deadbeef_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) plugins/libparser/libparser.a
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(deadbeef_SOURCES)
DIST_SOURCES = $(deadbeef_SOURCES)
++<<<<<<< HEAD
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
++=======
+ RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
++>>>>>>> upstream/0.6.2
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@@ -164,11 -217,33 +251,33 @@@ DATA = $(desktop_DATA) $(docs_DATA
HEADERS = $(sdk_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
- AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir dist dist-all distcheck
+ am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+ AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ cscope distdir dist dist-all distcheck
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+ $(LISP)config.h.in
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+ CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@@ -179,6 -254,7 +288,7 @@@ am__remove_distdir =
&& rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
+ am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@@ -206,6 -282,7 +316,7 @@@
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
+ DIST_TARGETS = dist-bzip2 dist-gzip
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@@ -233,6 -310,7 +344,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -253,10 -331,12 +365,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -279,6 -359,7 +393,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -332,6 -413,7 +447,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -350,6 -432,8 +466,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -375,13 -459,17 +493,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -390,7 -478,9 +512,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -477,7 -567,7 +601,7 @@@ deadbeef_SOURCES =
volume.c volume.h\
junklib.h junklib.c utf8.c utf8.h\
u8_lc_map.h\
- optmath.h\
+ fastftoi.h\
vfs.c vfs.h vfs_stdio.c\
md5/md5.c md5/md5.h\
metacache.c metacache.h\
@@@ -487,7 -577,8 +611,8 @@@
replaygain.c replaygain.h\
fft.c fft.h\
handler.c handler.h\
- strdupa.h
+ strdupa.h\
+ escape.c escape.h
# ConvertUTF/ConvertUTF.c ConvertUTF/ConvertUTF.h
@@@ -547,8 -638,8 +672,8 @@@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then rm -f stamp-h1; else :; fi
- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+ @test -f $@ || rm -f stamp-h1
+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@@ -573,10 -664,12 +698,12 @@@ install-binPROGRAMS: $(bin_PROGRAMS
fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p || test -f $$p1; \
- then echo "$$p"; echo "$$p"; else :; fi; \
+ while read p p1; do if test -f $$p \
+ || test -f $$p1 \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
sed 'N;N;N;s,\n, ,g' | \
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@@ -597,7 -690,8 +724,8 @@@ uninstall-binPROGRAMS
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' `; \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@@ -610,9 -704,10 +738,10 @@@ clean-binPROGRAMS
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
+
deadbeef$(EXEEXT): $(deadbeef_OBJECTS) $(deadbeef_DEPENDENCIES) $(EXTRA_deadbeef_DEPENDENCIES)
@rm -f deadbeef$(EXEEXT)
- $(LINK) $(deadbeef_OBJECTS) $(deadbeef_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(LINK) $(deadbeef_OBJECTS) $(deadbeef_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -622,6 -717,7 +751,7 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/conf.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dsppreset.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/escape.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fft.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/handler.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/junklib.Po at am__quote@
@@@ -644,39 -740,39 +774,39 @@@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/volume.Po at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
md5.o: md5/md5.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.o -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.o `test -f 'md5/md5.c' || echo '$(srcdir)/'`md5/md5.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5/md5.c' object='md5.o' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.o -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.o `test -f 'md5/md5.c' || echo '$(srcdir)/'`md5/md5.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5/md5.c' object='md5.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.o `test -f 'md5/md5.c' || echo '$(srcdir)/'`md5/md5.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.o `test -f 'md5/md5.c' || echo '$(srcdir)/'`md5/md5.c
md5.obj: md5/md5.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.obj -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.obj `if test -f 'md5/md5.c'; then $(CYGPATH_W) 'md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/md5/md5.c'; fi`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5/md5.c' object='md5.obj' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.obj -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.obj `if test -f 'md5/md5.c'; then $(CYGPATH_W) 'md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/md5/md5.c'; fi`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5/md5.c' object='md5.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.obj `if test -f 'md5/md5.c'; then $(CYGPATH_W) 'md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/md5/md5.c'; fi`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.obj `if test -f 'md5/md5.c'; then $(CYGPATH_W) 'md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/md5/md5.c'; fi`
mostlyclean-libtool:
-rm -f *.lo
@@@ -751,22 -847,25 +881,25 @@@ uninstall-sdkHEADERS
dir='$(DESTDIR)$(sdkdir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
- # (1) if the variable is set in `config.status', edit `config.status'
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+ # into them and run 'make' without going through this Makefile.
+ # To change the values of 'make' variables: instead of editing Makefiles,
+ # (1) if the variable is set in 'config.status', edit 'config.status'
+ # (which will cause the Makefiles to be regenerated when you run 'make');
+ # (2) otherwise, pass the desired values on the 'make' command line.
+ $(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@@ -781,57 -880,12 +914,12 @@@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
- $(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
- ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-recursive
+ TAGS: tags
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@@ -847,12 -901,7 +935,7 @@@
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -864,15 -913,11 +947,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-recursive
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -881,9 -926,31 +960,31 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+ clean-cscope:
+ -rm -f cscope.files
+ cscope.files: clean-cscope cscopelist
+ cscopelist: cscopelist-recursive
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
$(am__remove_distdir)
@@@ -951,40 -1018,41 +1052,41 @@@
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
- $(am__remove_distdir)
-
- dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-tarZ: distdir
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-shar: distdir
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
- dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ dist dist-all:
+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+ $(am__post_remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
@@@ -995,8 -1063,6 +1097,6 @@@ distcheck: dis
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.lz*) \
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
@@@ -1008,19 -1074,20 +1108,26 @@@
*.zip*) \
unzip $(distdir).zip ;;\
esac
++<<<<<<< HEAD
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
++=======
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_inst
++>>>>>>> upstream/0.6.2
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ && ../configure \
--with-included-gettext \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@@ -1043,7 -1110,7 +1150,7 @@@
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@@ -1187,14 -1254,13 +1294,13 @@@ ps-am
uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
uninstall-docsDATA uninstall-sdkHEADERS
- .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
- ctags-recursive install-am install-strip tags-recursive
+ .MAKE: $(am__recursive_targets) all install-am install-strip
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-binPROGRAMS \
- clean-generic clean-libtool ctags ctags-recursive dist \
- dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar \
- dist-tarZ dist-xz dist-zip distcheck distclean \
+ .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--refresh check check-am clean clean-binPROGRAMS \
+ clean-cscope clean-generic clean-libtool cscope cscopelist-am \
+ ctags ctags-am dist dist-all dist-bzip2 dist-gzip dist-lzip \
+ dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
@@@ -1207,9 -1273,8 +1313,8 @@@
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-desktopDATA uninstall-docsDATA \
- uninstall-sdkHEADERS
+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-desktopDATA uninstall-docsDATA uninstall-sdkHEADERS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined aclocal.m4
index 8f82519,5cf4e6f..3ae21c4
--- a/aclocal.m4
+++ b/aclocal.m4
@@@ -1,8 -1,7 +1,11 @@@
++<<<<<<< HEAD
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
++=======
+ # generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
++>>>>>>> upstream/0.6.2
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
- # Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -12,13 -11,14 +15,14 @@@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
+ To do so, use the procedure documented by the package, typically 'autoreconf'.])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
@@@ -180,25 -180,22 +184,26 @@@ els
fi[]dnl
])# PKG_CHECK_MODULES
- # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 1
-
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.11'
+ [am__api_version='1.14'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
++<<<<<<< HEAD
+m4_if([$1], [1.11.6], [],
++=======
+ m4_if([$1], [1.14.1], [],
++>>>>>>> upstream/0.6.2
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@@ -214,24 -211,22 +219,26 @@@ m4_define([_AM_AUTOCONF_VERSION], []
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++<<<<<<< HEAD
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
++=======
+ [AM_AUTOMAKE_VERSION([1.14.1])dnl
++>>>>>>> upstream/0.6.2
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
- # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ # Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 1
-
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
- # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+ # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
+ # '$srcdir', '$srcdir/..', or '$srcdir/../..'.
#
# Of course, Automake must honor this variable whenever it calls a
# tool from the auxiliary directory. The problem is that $srcdir (and
@@@ -250,7 -245,7 +257,7 @@@
#
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
# are both prefixed by $srcdir. In an in-source build this is usually
- # harmless because $srcdir is `.', but things will broke when you
+ # harmless because $srcdir is '.', but things will broke when you
# start a VPATH build or use an absolute $srcdir.
#
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@@ -276,22 -271,19 +283,19 @@@ am_aux_dir=`cd $ac_aux_dir && pwd
# AM_CONDITIONAL -*- Autoconf -*-
- # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
- # Free Software Foundation, Inc.
+ # Copyright (C) 1997-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 9
-
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
- [AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+ [AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@@ -310,16 -302,14 +314,14 @@@ AC_CONFIG_COMMANDS_PRE
Usually this means the macro was only invoked conditionally.]])
fi])])
- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
- # 2010, 2011 Free Software Foundation, Inc.
+ # Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 12
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
@@@ -329,7 -319,7 +331,7 @@@
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
- # NAME is "CC", "CXX", "GCJ", or "OBJC".
+ # NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@@ -342,12 -332,13 +344,13 @@@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMAN
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
- ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+ m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
AC_CACHE_CHECK([dependency style of $depcc],
[am_cv_$1_dependencies_compiler_type],
@@@ -355,8 -346,8 +358,8 @@@
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@@ -396,16 -387,16 +399,16 @@@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@@ -414,8 -405,8 +417,8 @@@
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@@ -423,7 -414,7 +426,7 @@@
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@@ -471,7 -462,7 +474,7 @@@ AM_CONDITIONAL([am__fastdep$1],
# AM_SET_DEPDIR
# -------------
# Choose a directory name for dependency files.
- # This macro is AC_REQUIREd in _AM_DEPENDENCIES
+ # This macro is AC_REQUIREd in _AM_DEPENDENCIES.
AC_DEFUN([AM_SET_DEPDIR],
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@@ -481,9 -472,13 +484,13 @@@
# AM_DEP_TRACK
# ------------
AC_DEFUN([AM_DEP_TRACK],
- [AC_ARG_ENABLE(dependency-tracking,
- [ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+ [AC_ARG_ENABLE([dependency-tracking], [dnl
+ AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])
+ AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
@@@ -498,20 -493,18 +505,18 @@@ _AM_SUBST_NOTMAKE([am__nodep])dn
# Generate code to set up dependency tracking. -*- Autoconf -*-
- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
- # Free Software Foundation, Inc.
+ # Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- #serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@@ -524,7 -517,7 +529,7 @@@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@@ -536,21 -529,19 +541,19 @@@
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
@@@ -568,7 -559,7 +571,7 @@@
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
- # is enabled. FIXME. This creates each `.P' file that we will
+ # is enabled. FIXME. This creates each '.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
@@@ -578,18 -569,21 +581,21 @@@
# Do all the work for Automake. -*- Autoconf -*-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 16
-
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
+ dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+ m4_define([AC_PROG_CC],
+ m4_defn([AC_PROG_CC])
+ [_AM_PROG_CC_C_O
+ ])
+
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
# -----------------------------------------------
@@@ -602,7 -596,7 +608,7 @@@
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
- [AC_PREREQ([2.62])dnl
+ [AC_PREREQ([2.65])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@@ -631,31 -625,40 +637,40 @@@ AC_SUBST([CYGPATH_W]
# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
- [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ [AC_DIAGNOSE([obsolete],
+ [$0: two- and three-arguments forms are deprecated.])
+ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
- m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+ m4_if(
+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ [ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
_AM_IF_OPTION([no-define],,
- [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+ [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
- AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
- AM_MISSING_PROG(AUTOCONF, autoconf)
- AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
- AM_MISSING_PROG(AUTOHEADER, autoheader)
- AM_MISSING_PROG(MAKEINFO, makeinfo)
+ AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+ AM_MISSING_PROG([AUTOCONF], [autoconf])
+ AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+ AM_MISSING_PROG([AUTOHEADER], [autoheader])
+ AM_MISSING_PROG([MAKEINFO], [makeinfo])
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+ # For better backward compatibility. To be removed once Automake 1.9.x
+ # dies out for good. For more background, see:
+ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+ AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
@@@ -666,34 -669,78 +681,78 @@@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TA
[_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES([CC])],
+ [m4_define([AC_PROG_CC],
+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES([CXX])],
+ [m4_define([AC_PROG_CXX],
+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES([OBJC])],
+ [m4_define([AC_PROG_OBJC],
+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+ [_AM_DEPENDENCIES([OBJCXX])],
+ [m4_define([AC_PROG_OBJCXX],
+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
])
- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
- dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
- dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
- dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+ AC_REQUIRE([AM_SILENT_RULES])dnl
+ dnl The testsuite driver may need to know about EXEEXT, so add the
+ dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
+ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
AC_CONFIG_COMMANDS_PRE(dnl
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
- ])
- dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+ # POSIX will say in a future version that running "rm -f" with no argument
+ # is OK; and we want to be able to make that assumption in our Makefile
+ # recipes. So use an aggressive probe to check that the usage we want is
+ # actually supported "in the wild" to an acceptable degree.
+ # See automake bug#10828.
+ # To make any issue more visible, cause the running configure to be aborted
+ # by default if the 'rm' program in use doesn't match our expectations; the
+ # user can still override this though.
+ if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+ Oops!
+
+ Your 'rm' program seems unable to run without file operands specified
+ on the command line, even when the '-f' option is present. This is contrary
+ to the behaviour of most rm programs out there, and not conforming with
+ the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+ Please tell bug-automake at gnu.org about your system, including the value
+ of your $PATH and any error possibly output before this message. This
+ can help us improve future automake versions.
+
+ END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+ Aborting the configuration process, to ensure you take notice of the issue.
+
+ You can download and install GNU coreutils to get an 'rm' implementation
+ that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+ If you want to complete the configuration process using your problematic
+ 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+ to "yes", and re-run configure.
+
+ END
+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+ fi
+ fi])
+
+ dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
dnl mangled by Autoconf and run in a shell conditional statement.
m4_define([_AC_COMPILER_EXEEXT],
m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. The stamp files are numbered to have different names.
@@@ -715,15 -762,12 +774,12 @@@ for _am_header in $config_headers :; d
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
- # Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
- # Inc.
+ # Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 1
-
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@@ -737,16 -781,14 +793,14 @@@ if test x"${install_sh}" != xset; the
install_sh="\${SHELL} $am_aux_dir/install-sh"
esac
fi
- AC_SUBST(install_sh)])
+ AC_SUBST([install_sh])])
- # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+ # Copyright (C) 2003-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 2
-
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
@@@ -763,20 -805,17 +817,17 @@@ AC_SUBST([am__leading_dot])]
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
- # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
- # 2011 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 5
-
# AM_MAINTAINER_MODE([DEFAULT-MODE])
# ----------------------------------
# Control maintainer-specific portions of Makefiles.
- # Default is to disable them, unless `enable' is passed literally.
- # For symmetry, `disable' may be passed as well. Anyway, the user
+ # Default is to disable them, unless 'enable' is passed literally.
+ # For symmetry, 'disable' may be passed as well. Anyway, the user
# can override the default with the --enable/--disable switch.
AC_DEFUN([AM_MAINTAINER_MODE],
[m4_case(m4_default([$1], [disable]),
@@@ -787,10 -826,11 +838,11 @@@
AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode's default is 'disable' unless 'enable' is passed
AC_ARG_ENABLE([maintainer-mode],
- [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
- (and sometimes confusing) to the casual installer],
- [USE_MAINTAINER_MODE=$enableval],
- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+ [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+ am_maintainer_other[ make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer])],
+ [USE_MAINTAINER_MODE=$enableval],
+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
MAINT=$MAINTAINER_MODE_TRUE
@@@ -798,18 -838,14 +850,14 @@@
]
)
- AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
# Check to see how 'make' treats includes. -*- Autoconf -*-
- # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+ # Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 4
-
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
@@@ -827,7 -863,7 +875,7 @@@ am__quote
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
- # Ignore all kinds of additional output from `make'.
+ # Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@@ -854,15 -890,12 +902,12 @@@ rm -f confinc confm
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
- # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
- # Free Software Foundation, Inc.
+ # Copyright (C) 1997-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 6
-
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
@@@ -870,11 -903,10 +915,10 @@@
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-
# AM_MISSING_HAS_RUN
# ------------------
- # Define MISSING if not defined so far and test if it supports --run.
- # If it does, set am_missing_run to use it, otherwise, to nothing.
+ # Define MISSING if not defined so far and test if it is modern enough.
+ # If it is, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
@@@ -887,29 -919,32 +931,32 @@@ if test x"${MISSING+set}" != xset; the
esac
fi
# Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+ if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
+ AC_MSG_WARN(['missing' script is too old or missing])
fi
])
- # Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
- # Inc.
+ # Copyright (C) 2003-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 1
-
# AM_PROG_MKDIR_P
# ---------------
- # Check for `mkdir -p'.
+ # Check for 'mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
[AC_PREREQ([2.60])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+ dnl FIXME we are no longer going to remove this! adjust warning
+ dnl FIXME message accordingly.
+ AC_DIAGNOSE([obsolete],
+ [$0: this macro is deprecated, and will soon be removed.
+ You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
+ and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
dnl while keeping a definition of mkdir_p for backward compatibility.
dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
@@@ -926,15 -961,12 +973,12 @@@ esa
# Helper functions for option handling. -*- Autoconf -*-
- # Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
- # Foundation, Inc.
+ # Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 5
-
# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
@@@ -944,7 -976,7 +988,7 @@@
# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
- [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+ [m4_define(_AM_MANGLE_OPTION([$1]), [1])])
# _AM_SET_OPTIONS(OPTIONS)
# ------------------------
@@@ -958,13 -990,58 +1002,58 @@@ AC_DEFUN([_AM_SET_OPTIONS]
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ # Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 1
+ # _AM_PROG_CC_C_O
+ # ---------------
+ # Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
+ # to automatically call this.
+ AC_DEFUN([_AM_PROG_CC_C_O],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([compile])dnl
+ AC_LANG_PUSH([C])dnl
+ AC_CACHE_CHECK(
+ [whether $CC understands -c and -o together],
+ [am_cv_prog_cc_c_o],
+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i])
+ if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+ fi
+ AC_LANG_POP([C])])
+
+ # For backward compatibility.
+ AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+ # Copyright (C) 2001-2013 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
# AM_RUN_LOG(COMMAND)
# -------------------
@@@ -979,22 -1056,16 +1068,16 @@@ AC_DEFUN([AM_RUN_LOG]
# Check to make sure that the build environment is sane. -*- Autoconf -*-
- # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
- # Free Software Foundation, Inc.
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 5
-
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
- # Just in case
- sleep 1
- echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@@ -1005,32 -1076,40 +1088,40 @@@ case `pwd` i
esac
case $srcdir in
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
esac
- # Do `set' in a subshell so we don't clobber the current shell's
+ # Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+ alias in your environment])
+ fi
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$[2]" = conftest.file
)
then
@@@ -1040,46 -1119,118 +1131,118 @@@ els
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
- AC_MSG_RESULT(yes)])
+ AC_MSG_RESULT([yes])
+ # If we didn't sleep, we still need to ensure time stamps of config.status and
+ # generated files are strictly newer.
+ am_sleep_pid=
+ if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+ fi
+ AC_CONFIG_COMMANDS_PRE(
+ [AC_MSG_CHECKING([that generated files are newer than configure])
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ AC_MSG_RESULT([done])])
+ rm -f conftest.file
+ ])
- # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ # Copyright (C) 2009-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 1
+ # AM_SILENT_RULES([DEFAULT])
+ # --------------------------
+ # Enable less verbose build rules; with the default set to DEFAULT
+ # ("yes" being less verbose, "no" or empty being verbose).
+ AC_DEFUN([AM_SILENT_RULES],
+ [AC_ARG_ENABLE([silent-rules], [dnl
+ AS_HELP_STRING(
+ [--enable-silent-rules],
+ [less verbose build output (undo: "make V=1")])
+ AS_HELP_STRING(
+ [--disable-silent-rules],
+ [verbose build output (undo: "make V=0")])dnl
+ ])
+ case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+ esac
+ dnl
+ dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+ dnl do not support nested variable expansions.
+ dnl See automake bug#9928 and bug#10237.
+ am_make=${MAKE-make}
+ AC_CACHE_CHECK([whether $am_make supports nested variables],
+ [am_cv_make_support_nested_variables],
+ [if AS_ECHO([['TRUE=$(BAR$(V))
+ BAR0=false
+ BAR1=true
+ V=1
+ am__doit:
+ @$(TRUE)
+ .PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+ else
+ am_cv_make_support_nested_variables=no
+ fi])
+ if test $am_cv_make_support_nested_variables = yes; then
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+ else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+ fi
+ AC_SUBST([AM_V])dnl
+ AM_SUBST_NOTMAKE([AM_V])dnl
+ AC_SUBST([AM_DEFAULT_V])dnl
+ AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+ AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+ AM_BACKSLASH='\'
+ AC_SUBST([AM_BACKSLASH])dnl
+ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+ ])
+
+ # Copyright (C) 2001-2013 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
# AM_PROG_INSTALL_STRIP
# ---------------------
- # One issue with vendor `install' (even GNU) is that you can't
+ # One issue with vendor 'install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
# is unlikely to handle the host's binaries.
# Fortunately install-sh will honor a STRIPPROG variable, so we
- # always use install-sh in `make install-strip', and initialize
+ # always use install-sh in "make install-strip", and initialize
# STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
- # Installed binaries are usually stripped using `strip' when the user
- # run `make install-strip'. However `strip' might not be the right
+ # Installed binaries are usually stripped using 'strip' when the user
+ # run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
- # will honor the `STRIP' environment variable to overrule this program.
- dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+ # will honor the 'STRIP' environment variable to overrule this program.
+ dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
- # Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+ # Copyright (C) 2006-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 3
-
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@@ -1093,18 -1244,16 +1256,16 @@@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST
# Check how to create a tarball. -*- Autoconf -*-
- # Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+ # Copyright (C) 2004-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
- # serial 2
-
# _AM_PROG_TAR(FORMAT)
# --------------------
# Check how to create a tarball in format FORMAT.
- # FORMAT should be one of `v7', `ustar', or `pax'.
+ # FORMAT should be one of 'v7', 'ustar', or 'pax'.
#
# Substitute a variable $(am__tar) that is a command
# writing to stdout a FORMAT-tarball containing the directory
@@@ -1114,76 -1263,114 +1275,114 @@@
# Substitute a variable $(am__untar) that extract such
# a tarball read from stdin.
# $(am__untar) < result.tar
+ #
AC_DEFUN([_AM_PROG_TAR],
[# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AC_SUBST([AMTAR], ['$${TAR-tar}'])
- m4_if([$1], [v7],
- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
- AC_MSG_CHECKING([how to create a $1 tar archive])
- # Loop over all known methods to create a tar archive until one works.
+
+ # We'll loop over all known methods to create a tar archive until one works.
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
- _am_tools=${am_cv_prog_tar_$1-$_am_tools}
- # Do not fold the above two line into one, because Tru64 sh and
- # Solaris sh will not grok spaces in the rhs of `-'.
- for _am_tool in $_am_tools
- do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
+ m4_if([$1], [v7],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+ [m4_case([$1],
+ [ustar],
+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+ # and bug#13588).
+ am_max_uid=2097151 # 2^21 - 1
+ am_max_gid=$am_max_uid
+ # The $UID and $GID variables are not portable, so we need to resort
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
+ # below are definitely unexpected, so allow the users to see them
+ # (that is, avoid stderr redirection).
+ am_uid=`id -u || echo unknown`
+ am_gid=`id -g || echo unknown`
+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+ if test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi
+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+ if test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi],
+
+ [pax],
+ [],
+
+ [m4_fatal([Unknown tar format])])
+
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ AM_RUN_LOG([cat conftest.dir/file])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
- done
- rm -rf conftest.dir
- AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
- AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
diff --combined configure
index e2d0b24,a4532e1..10f00bc
--- a/configure
+++ b/configure
@@@ -1,6 -1,6 +1,10 @@@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
++<<<<<<< HEAD
+# Generated by GNU Autoconf 2.69 for deadbeef 0.6.0.
++=======
+ # Generated by GNU Autoconf 2.69 for deadbeef 0.6.2.
++>>>>>>> upstream/0.6.2
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@@ -587,8 -587,8 +591,13 @@@ MAKEFLAGS
# Identity of this package.
PACKAGE_NAME='deadbeef'
PACKAGE_TARNAME='deadbeef'
++<<<<<<< HEAD
+PACKAGE_VERSION='0.6.0'
+PACKAGE_STRING='deadbeef 0.6.0'
++=======
+ PACKAGE_VERSION='0.6.2'
+ PACKAGE_STRING='deadbeef 0.6.2'
++>>>>>>> upstream/0.6.2
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@@ -650,8 -650,6 +659,6 @@@ HAVE_WMA_FALS
HAVE_WMA_TRUE
HAVE_ALAC_FALSE
HAVE_ALAC_TRUE
- HAVE_SHELLEXECUI_FALSE
- HAVE_SHELLEXECUI_TRUE
HAVE_MONO2STEREO_FALSE
HAVE_MONO2STEREO_TRUE
HAVE_SHN_FALSE
@@@ -688,6 -686,8 +695,8 @@@ HAVE_WILDMIDI_FALS
HAVE_WILDMIDI_TRUE
HAVE_MUSEPACK_FALSE
HAVE_MUSEPACK_TRUE
+ HAVE_SHELLEXECUI_FALSE
+ HAVE_SHELLEXECUI_TRUE
HAVE_SHELLEXEC_FALSE
HAVE_SHELLEXEC_TRUE
HAVE_NOTIFY_FALSE
@@@ -716,6 -716,8 +725,8 @@@ HAVE_FFAP_FALS
HAVE_FFAP_TRUE
HAVE_ADPLUG_FALSE
HAVE_ADPLUG_TRUE
+ ARTWORK_USE_VFS_CURL_FALSE
+ ARTWORK_USE_VFS_CURL_TRUE
HAVE_ARTWORK_FALSE
HAVE_ARTWORK_TRUE
HAVE_PULSE_FALSE
@@@ -738,16 -740,21 +749,21 @@@ HAVE_WAVPACK_FALS
HAVE_WAVPACK_TRUE
HAVE_FLAC_FALSE
HAVE_FLAC_TRUE
+ HAVE_OGG_STREAM_FLUSH_FILL_FALSE
+ HAVE_OGG_STREAM_FLUSH_FILL_TRUE
+ HAVE_OGG_FALSE
+ HAVE_OGG_TRUE
HAVE_VORBIS_FALSE
HAVE_VORBIS_TRUE
APE_USE_YASM_FALSE
APE_USE_YASM_TRUE
LIBMMS_LIBS
FAAD2_LIBS
+ FAAD2_CFLAGS
NOTIFY_CFLAGS
NOTIFY_LIBS
- LIBSAMPLERATE_DEPS_CFLAGS
LIBSAMPLERATE_DEPS_LIBS
+ LIBSAMPLERATE_DEPS_CFLAGS
IMLIB2_DEPS_LIBS
IMLIB2_DEPS_CFLAGS
PNG_DEPS_LIBS
@@@ -756,14 -763,24 +772,24 @@@ JPEG_DEPS_LIB
JPEG_DEPS_CFLAGS
OSS_CFLAGS
HOTKEYS_LIBS
+ HOTKEYS_CFLAGS
CDDA_CFLAGS
CDDA_LIBS
+ VFS_CURL_CFLAGS
VFS_CURL_LIBS
SNDFILE_LIBS
+ SNDFILE_CFLAGS
WAVPACK_LIBS
+ WAVPACK_CFLAGS
FLAC_LIBS
+ FLAC_CFLAGS
+ OGG_CFLAGS
+ OGG_LIBS
+ VORBIS_CFLAGS
VORBIS_LIBS
MAD_LIBS
+ MAD_CFLAGS
+ CURL_CFLAGS
CURL_LIBS
ICONV_LIB
PULSE_DEPS_LIBS
@@@ -784,15 -801,17 +810,17 @@@ GTK_MAC_CFLAG
GTK3_DEPS_LIBS
GTK3_DEPS_CFLAGS
ZIP_LIBS
+ ZIP_CFLAGS
ZLIB_LIBS
+ ZLIB_CFLAGS
DL_LIBS
HAVE_YASM
INTL_LIBS
+ NOCPPLIB
INSANE_CXXFLAGS
INSANE_CFLAGS
YASM_FLAGS
LIB
- NOCPPLIB
GETTEXT_PACKAGE
ALL_LINGUAS
INTLTOOL_PERL
@@@ -821,7 -840,6 +849,6 @@@ INTLTOOL_V_MERGE_OPTION
INTLTOOL__v_MERGE_0
INTLTOOL__v_MERGE_
INTLTOOL_V_MERGE
- AM_DEFAULT_VERBOSITY
INTLTOOL_EXTRACT
INTLTOOL_MERGE
INTLTOOL_UPDATE
@@@ -940,6 -958,10 +967,10 @@@ C
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
+ AM_BACKSLASH
+ AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V
+ AM_V
am__untar
am__tar
AMTAR
@@@ -1004,6 -1026,7 +1035,7 @@@ SHELL
ac_subst_files=''
ac_user_opts='
enable_option_checking
+ enable_silent_rules
enable_maintainer_mode
enable_dependency_tracking
enable_shared
@@@ -1030,6 -1053,7 +1062,7 @@@ enable_gtk
enable_vfs_curl
enable_lfm
enable_artwork
+ enable_artwork_network
enable_supereq
enable_sid
enable_mad
@@@ -1087,6 -1111,8 +1120,8 @@@ OBJCFLAG
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
+ ZIP_CFLAGS
+ ZIP_LIBS
GTK3_DEPS_CFLAGS
GTK3_DEPS_LIBS
GTK_MAC_CFLAGS
@@@ -1645,7 -1671,7 +1680,11 @@@ if test "$ac_init_help" = "long"; the
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
++<<<<<<< HEAD
+\`configure' configures deadbeef 0.6.0 to adapt to many kinds of systems.
++=======
+ \`configure' configures deadbeef 0.6.2 to adapt to many kinds of systems.
++>>>>>>> upstream/0.6.2
Usage: $0 [OPTION]... [VAR=VALUE]...
@@@ -1715,7 -1741,7 +1754,11 @@@ f
if test -n "$ac_init_help"; then
case $ac_init_help in
++<<<<<<< HEAD
+ short | recursive ) echo "Configuration of deadbeef 0.6.0:";;
++=======
+ short | recursive ) echo "Configuration of deadbeef 0.6.2:";;
++>>>>>>> upstream/0.6.2
esac
cat <<\_ACEOF
@@@ -1723,10 -1749,15 +1766,15 @@@ Optional Features
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-maintainer-mode enable make rules and dependencies not useful
- (and sometimes confusing) to the casual installer
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-silent-rules less verbose build output (undo: "make V=1")
+ --disable-silent-rules verbose build output (undo: "make V=0")
+ --enable-maintainer-mode
+ enable make rules and dependencies not useful (and
+ sometimes confusing) to the casual installer
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
@@@ -1743,14 -1774,17 +1791,17 @@@
enabled)
--disable-pulse disable PulseAudio output plugin (default: enabled)
--disable-coreaudio disable CoreAudio output plugin (default: enabled)
- --disable-gtk3 build GTK3 version of gtkui plugin (default:
+ --disable-gtk3 disable GTK3 version of gtkui plugin (default:
enabled)
- --disable-gtk2 build GTK2 version of gtkui plugin (default:
+ --disable-gtk2 disable GTK2 version of gtkui plugin (default:
enabled)
--disable-vfs-curl disable HTTP streaming vfs plugin (default: enabled)
--disable-lfm disable last.fm/libre.fm scrobbler plugin (default:
enabled)
--disable-artwork disable album art loader plugin (default: enabled)
+ --disable-artwork-network
+ disable album art network loading support (default:
+ enabled)
--disable-supereq disable SuperEQ DSP plugin (default: enabled)
--disable-sid disable commodore64 SID music player plugin
(default: enabled)
@@@ -1841,6 -1875,8 +1892,8 @@@ Some influential environment variables
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
+ ZIP_CFLAGS C compiler flags for ZIP, overriding pkg-config
+ ZIP_LIBS linker flags for ZIP, overriding pkg-config
GTK3_DEPS_CFLAGS
C compiler flags for GTK3_DEPS, overriding pkg-config
GTK3_DEPS_LIBS
@@@ -1944,7 -1980,7 +1997,11 @@@ f
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
++<<<<<<< HEAD
+deadbeef configure 0.6.0
++=======
+ deadbeef configure 0.6.2
++>>>>>>> upstream/0.6.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@@ -2705,7 -2741,7 +2762,11 @@@ cat >config.log <<_ACEO
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
++<<<<<<< HEAD
+It was created by deadbeef $as_me 0.6.0, which was
++=======
+ It was created by deadbeef $as_me 0.6.2, which was
++>>>>>>> upstream/0.6.2
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@@ -3061,7 -3097,7 +3122,7 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
ac_config_headers="$ac_config_headers config.h"
- am__api_version='1.11'
+ am__api_version='1.14'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@@ -3187,9 -3223,6 +3248,6 @@@ test -z "$INSTALL_DATA" && INSTALL_DATA
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
- # Just in case
- sleep 1
- echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@@ -3200,32 -3233,40 +3258,40 @@@ case `pwd` i
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
esac
- # Do `set' in a subshell so we don't clobber the current shell's
+ # Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$2" = conftest.file
)
then
@@@ -3237,6 -3278,16 +3303,16 @@@ Check your system clock" "$LINENO"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+ # If we didn't sleep, we still need to ensure time stamps of config.status and
+ # generated files are strictly newer.
+ am_sleep_pid=
+ if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+ fi
+
+ rm -f conftest.file
+
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
@@@ -3259,12 -3310,12 +3335,12 @@@ if test x"${MISSING+set}" != xset; the
esac
fi
# Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+ if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
- $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
if test x"${install_sh}" != xset; then
@@@ -3276,10 -3327,10 +3352,10 @@@
esac
fi
- # Installed binaries are usually stripped using `strip' when the user
- # run `make install-strip'. However `strip' might not be the right
+ # Installed binaries are usually stripped using 'strip' when the user
+ # run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
- # will honor the `STRIP' environment variable to overrule this program.
+ # will honor the 'STRIP' environment variable to overrule this program.
if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@@ -3418,12 -3469,6 +3494,6 @@@ f
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
- mkdir_p="$MKDIR_P"
- case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
- esac
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@@ -3506,6 -3551,45 +3576,45 @@@ els
fi
rmdir .tst 2>/dev/null
+ # Check whether --enable-silent-rules was given.
+ if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+ fi
+
+ case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
+ esac
+ am_make=${MAKE-make}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+ $as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+ if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if $as_echo 'TRUE=$(BAR$(V))
+ BAR0=false
+ BAR1=true
+ V=1
+ am__doit:
+ @$(TRUE)
+ .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+ else
+ am_cv_make_support_nested_variables=no
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+ $as_echo "$am_cv_make_support_nested_variables" >&6; }
+ if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+ else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+ fi
+ AM_BACKSLASH='\'
+
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@@ -3528,7 -3612,7 +3637,11 @@@ f
# Define the identity of the package.
PACKAGE='deadbeef'
++<<<<<<< HEAD
+ VERSION='0.6.0'
++=======
+ VERSION='0.6.2'
++>>>>>>> upstream/0.6.2
cat >>confdefs.h <<_ACEOF
@@@ -3556,6 -3640,12 +3669,12 @@@ AUTOHEADER=${AUTOHEADER-"${am_missing_r
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ # For better backward compatibility. To be removed once Automake 1.9.x
+ # dies out for good. For more background, see:
+ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+ mkdir_p='$(MKDIR_P)'
+
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
@@@ -3563,86 -3653,125 +3682,125 @@@
AMTAR='$${TAR-tar}'
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
- $as_echo_n "checking how to create a ustar tar archive... " >&6; }
- # Loop over all known methods to create a tar archive until one works.
+ # We'll loop over all known methods to create a tar archive until one works.
_am_tools='gnutar plaintar pax cpio none'
- _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
- # Do not fold the above two line into one, because Tru64 sh and
- # Solaris sh will not grok spaces in the rhs of `-'.
- for _am_tool in $_am_tools
- do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- { echo "$as_me:$LINENO: $_am_tar --version" >&5
+
+ # The POSIX 1988 'ustar' format is defined with fixed-size fields.
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+ # and bug#13588).
+ am_max_uid=2097151 # 2^21 - 1
+ am_max_gid=$am_max_uid
+ # The $UID and $GID variables are not portable, so we need to resort
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
+ # below are definitely unexpected, so allow the users to see them
+ # (that is, avoid stderr redirection).
+ am_uid=`id -u || echo unknown`
+ am_gid=`id -g || echo unknown`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
+ $as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
+ if test $am_uid -le $am_max_uid; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ _am_tools=none
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
+ $as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
+ if test $am_gid -le $am_max_gid; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ _am_tools=none
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+ $as_echo_n "checking how to create a ustar tar archive... " >&6; }
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ { echo "$as_me:$LINENO: $_am_tar --version" >&5
($_am_tar --version) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && break
- done
- am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x ustar -w "$$tardir"'
- am__tar_='pax -L -x ustar -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
- am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
- am__untar='cpio -i -H ustar -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
+ done
+ am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x ustar -w "$$tardir"'
+ am__tar_='pax -L -x ustar -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
+ am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
+ am__untar='cpio -i -H ustar -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_ustar}" && break
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_ustar}" && break
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
(tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
- rm -rf conftest.dir
- if test -s conftest.tar; then
- { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
($am__untar <conftest.tar) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
- done
- rm -rf conftest.dir
+ { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
+ (cat conftest.dir/file) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
+ rm -rf conftest.dir
- if ${am_cv_prog_tar_ustar+:} false; then :
+ if ${am_cv_prog_tar_ustar+:} false; then :
$as_echo_n "(cached) " >&6
else
am_cv_prog_tar_ustar=$_am_tool
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
$as_echo "$am_cv_prog_tar_ustar" >&6; }
@@@ -3650,6 -3779,48 +3808,48 @@@
+ # POSIX will say in a future version that running "rm -f" with no argument
+ # is OK; and we want to be able to make that assumption in our Makefile
+ # recipes. So use an aggressive probe to check that the usage we want is
+ # actually supported "in the wild" to an acceptable degree.
+ # See automake bug#10828.
+ # To make any issue more visible, cause the running configure to be aborted
+ # by default if the 'rm' program in use doesn't match our expectations; the
+ # user can still override this though.
+ if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+ Oops!
+
+ Your 'rm' program seems unable to run without file operands specified
+ on the command line, even when the '-f' option is present. This is contrary
+ to the behaviour of most rm programs out there, and not conforming with
+ the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+ Please tell bug-automake at gnu.org about your system, including the value
+ of your $PATH and any error possibly output before this message. This
+ can help us improve future automake versions.
+
+ END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+ Aborting the configuration process, to ensure you take notice of the issue.
+
+ You can download and install GNU coreutils to get an 'rm' implementation
+ that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+ If you want to complete the configuration process using your problematic
+ 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+ to "yes", and re-run configure.
+
+ END
+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+ fi
+ fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@@ -3692,7 -3863,7 +3892,7 @@@ am__quote
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
- # Ignore all kinds of additional output from `make'.
+ # Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@@ -4525,6 -4696,65 +4725,65 @@@ ac_compile='$CC -c $CFLAGS $CPPFLAGS co
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+ $as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+ if ${am_cv_prog_cc_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+ main ()
+ {
+
+ ;
+ return 0;
+ }
+ _ACEOF
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+ $as_echo "$am_cv_prog_cc_c_o" >&6; }
+ if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+ fi
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@@ -4536,8 -4766,8 +4795,8 @@@ els
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@@ -4572,16 -4802,16 +4831,16 @@@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@@ -4590,8 -4820,8 +4849,8 @@@
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@@ -4599,7 -4829,7 +4858,7 @@@
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@@ -12851,6 -13081,65 +13110,65 @@@ ac_compile='$CC -c $CFLAGS $CPPFLAGS co
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+ $as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+ if ${am_cv_prog_cc_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+ main ()
+ {
+
+ ;
+ return 0;
+ }
+ _ACEOF
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+ $as_echo "$am_cv_prog_cc_c_o" >&6; }
+ if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+ fi
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@@ -12862,8 -13151,8 +13180,8 @@@ els
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@@ -12898,16 -13187,16 +13216,16 @@@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@@ -12916,8 -13205,8 +13234,8 @@@
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@@ -12925,7 -13214,7 +13243,7 @@@
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@@ -13247,8 -13536,8 +13565,8 @@@ els
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@@ -13283,16 -13572,16 +13601,16 @@@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@@ -13301,8 -13590,8 +13619,8 @@@
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@@ -13310,7 -13599,7 +13628,7 @@@
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@@ -16840,8 -17129,8 +17158,8 @@@ els
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@@ -16874,16 -17163,16 +17192,16 @@@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@@ -16892,8 -17181,8 +17210,8 @@@
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@@ -16901,7 -17190,7 +17219,7 @@@
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@@ -17294,6 -17583,13 +17612,13 @@@ $as_echo "#define AC_APPLE_UNIVERSAL_BU
esac
+ mkdir_p="$MKDIR_P"
+ case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+ esac
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
$as_echo_n "checking whether NLS is requested... " >&6; }
# Check whether --enable-nls was given.
@@@ -23240,16 -23536,11 +23565,11 @@@ _ACEO
case "$host" in
- *-*-gnu)
- NOCPPLIB="-nostdlib -lsupc++";;
- esac
-
- case "$host" in
i686-apple-*)
$as_echo "#define ARCH_X86_32 1" >>confdefs.h
- LIB="../deadbeef-deps/lib-x86-32-apple"
+ LIB="static-deps/lib-x86-32-apple"
YASM_FLAGS="-f macho32 -D ARCH_X86_32 -m x86 -DPREFIX"
APE_USE_YASM=yes
OS_OSX=yes
@@@ -23258,7 -23549,7 +23578,7 @@@
$as_echo "#define ARCH_X86_64 1" >>confdefs.h
- LIB="../deadbeef-deps/lib-x86-64-apple"
+ LIB="static-deps/lib-x86-64-apple"
YASM_FLAGS="-f macho64 -D ARCH_X86_64 -m amd64 -DPIC -DPREFIX"
APE_USE_YASM=yes
OS_OSX=yes
@@@ -23267,7 -23558,7 +23587,7 @@@
$as_echo "#define ARCH_X86_32 1" >>confdefs.h
- LIB="../deadbeef-deps/lib-x86-32"
+ LIB="static-deps/lib-x86-32"
YASM_FLAGS="-f elf -D ARCH_X86_32 -m x86"
APE_USE_YASM=yes
;;
@@@ -23275,22 -23566,21 +23595,21 @@@
$as_echo "#define ARCH_X86_64 1" >>confdefs.h
- LIB="../deadbeef-deps/lib-x86-64"
+ LIB="static-deps/lib-x86-64"
YASM_FLAGS="-f elf -D ARCH_X86_64 -m amd64"
APE_USE_YASM=yes
- KILLCPPFLAGS="-nostdlib -lsupc++"
;;
powerpc-*-* )
$as_echo "#define ARCH_PPC_32 1" >>confdefs.h
- LIB="../deadbeef-deps/lib-ppc-32"
+ LIB="static-deps/lib-ppc-32"
;;
powerpc64-*-* )
$as_echo "#define ARCH_PPC_64 1" >>confdefs.h
- LIB="../deadbeef-deps/lib-ppc-64"
+ LIB="static-deps/lib-ppc-64"
;;
*)
@@@ -23301,7 -23591,6 +23620,6 @@@ esa
-
test "x$prefix" = xNONE && prefix=$ac_default_prefix
@@@ -23378,6 -23667,13 +23696,13 @@@ els
enable_artwork=yes
fi
+ # Check whether --enable-artwork-network was given.
+ if test "${enable_artwork_network+set}" = set; then :
+ enableval=$enable_artwork_network; enable_artwork_network=$enableval
+ else
+ enable_artwork_network=yes
+ fi
+
# Check whether --enable-supereq was given.
if test "${enable_supereq+set}" = set; then :
enableval=$enable_supereq; enable_supereq=$enableval
@@@ -23667,6 -23963,21 +23992,21 @@@ _ACEO
fi
+ case "$host" in
+ *-*-gnu )
+ if test "${enable_staticlink}" != "no"; then :
+
+ NOCPPLIB="-nostdlib ../../$LIB/lib/libsupc++.a"
+
+ else
+
+ NOCPPLIB=""
+
+ fi
+
+ ;;
+ esac
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lintl" >&5
$as_echo_n "checking for main in -lintl... " >&6; }
if ${ac_cv_lib_intl_main+:} false; then :
@@@ -23921,8 -24232,11 +24261,11 @@@ CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_S
if test "${enable_staticlink}" != "no"; then :
HAVE_ZLIB=yes
+ ZLIB_CFLAGS="-I../../$LIB/include"
ZLIB_LIBS="../../$LIB/lib/libz.a"
+
+
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5
@@@ -23961,59 -24275,101 +24304,101 @@@ f
ZLIB_LIBS="-lz"
- fi
+ fi
if test "${enable_staticlink}" != "no"; then :
HAVE_ZIP=yes
+ ZIP_CFLAGS="-I../../$LIB/include"
ZIP_LIBS="../../$LIB/lib/libzip.a ../../$LIB/lib/libz.a"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lzip" >&5
- $as_echo_n "checking for main in -lzip... " >&6; }
- if ${ac_cv_lib_zip_main+:} false; then :
- $as_echo_n "(cached) " >&6
+
else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lzip $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- int
- main ()
- {
- return main ();
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_zip_main=yes
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZIP" >&5
+ $as_echo_n "checking for ZIP... " >&6; }
+
+ if test -n "$ZIP_CFLAGS"; then
+ pkg_cv_ZIP_CFLAGS="$ZIP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libzip") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_ZIP_CFLAGS=`$PKG_CONFIG --cflags "libzip" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
- ac_cv_lib_zip_main=no
+ pkg_failed=yes
fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
+ else
+ pkg_failed=untried
+ fi
+ if test -n "$ZIP_LIBS"; then
+ pkg_cv_ZIP_LIBS="$ZIP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libzip") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_ZIP_LIBS=`$PKG_CONFIG --libs "libzip" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_main" >&5
- $as_echo "$ac_cv_lib_zip_main" >&6; }
- if test "x$ac_cv_lib_zip_main" = xyes; then :
- HAVE_ZIP=yes
+ else
+ pkg_failed=untried
fi
- ZIP_LIBS="-lzip"
+
+ if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+ else
+ _pkg_short_errors_supported=no
fi
+ if test $_pkg_short_errors_supported = yes; then
+ ZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzip" 2>&1`
+ else
+ ZIP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzip" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ZIP_PKG_ERRORS" >&5
+ HAVE_ZIP=no
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ HAVE_ZIP=no
+ else
+ ZIP_CFLAGS=$pkg_cv_ZIP_CFLAGS
+ ZIP_LIBS=$pkg_cv_ZIP_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ HAVE_ZIP=yes
+ fi
+
+ fi
if test "${enable_gtk3}" = "yes"; then :
if test "${enable_staticlink}" != "no"; then :
+ GTK3_DEPS_CFLAGS="-I../../${LIB}/gtk-3.0.0/include/gtk-3.0 -I../../${LIB}/gtk-3.0.0/include/pango-1.0 -I../../${LIB}/gtk-3.0.0/include/gio-unix-2.0/ -I../../${LIB}/gtk-3.0.0/include/atk-1.0 -I../../${LIB}/gtk-3.0.0/include/cairo -I../../${LIB}/gtk-3.0.0/include/gdk-pixbuf-2.0 -I../../${LIB}/gtk-3.0.0/include/freetype2 -I../../${LIB}/gtk-3.0.0/include/glib-2.0 -I../../${LIB}/gtk-3.0.0/lib/glib-2.0/include"
+ GTK3_DEPS_LIBS="-L${GTK_ROOT_300}/lib -lgtk-3 -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
+
+
HAVE_GTK3=yes
else
@@@ -24206,6 -24562,10 +24591,10 @@@ if test "${enable_gtk2}" = "yes"; then
if test "${enable_staticlink}" != "no"; then :
+ GTK2_DEPS_CFLAGS="-I${GTK_ROOT_216}/include/gtk-2.0 -I${GTK_ROOT_216}/lib/gtk-2.0/include -I${GTK_ROOT_216}/include/atk-1.0 -I${GTK_ROOT_216}/include/cairo -I${GTK_ROOT_216}/include/pango-1.0 -I${GTK_ROOT_216}/include -I${GTK_ROOT_216}/include/glib-2.0 -I${GTK_ROOT_216}/lib/glib-2.0/include"
+ GTK2_DEPS_LIBS="-L${GTK_ROOT_216}/lib -lgtk-x11-2.0 -lpango-1.0 -lcairo -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
+
+
HAVE_GTK2=yes
else
@@@ -24292,6 -24652,16 +24681,16 @@@ f
if test "${enable_alsa}" != "no"; then :
+ if test "${enable_staticlink}" != "no"; then :
+
+ HAVE_ALSA=yes
+ ALSA_DEPS_CFLAGS="-I../../$LIB/include"
+ ALSA_DEPS_LIBS="-lasound"
+
+
+
+ else
+
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA_DEPS" >&5
@@@ -24366,6 -24736,8 +24765,8 @@@ f
fi
+ fi
+
ac_fn_c_check_header_mongrel "$LINENO" "CoreAudio/AudioHardware.h" "ac_cv_header_CoreAudio_AudioHardware_h" "$ac_includes_default"
if test "x$ac_cv_header_CoreAudio_AudioHardware_h" = xyes; then :
found_coreaudio_h=yes
@@@ -24381,7 -24753,7 +24782,7 @@@ if test "${enable_coreaudio}" != "no" -
$as_echo "#define HAVE_COREAUDIO 1" >>confdefs.h
HAVE_COREAUDIO=yes
- COREAUDIO_LIBS="-Wl,-framework,CoreAudio"
+ COREAUDIO_LIBS="-Wl,-framework,CoreAudio -Wl,-framework,AudioUnit"
fi
@@@ -24560,6 -24932,16 +24961,16 @@@ f
if test "${enable_pulse}" != "no"; then :
+ if test "${enable_staticlink}" != "no"; then :
+
+ HAVE_PULSE=yes
+ PULSE_DEPS_LIBS="-lpulse-simple"
+ PULSE_DEPS_CFLAGS="-I../../$LIB/include/"
+
+
+
+ else
+
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSE_DEPS" >&5
@@@ -24634,6 -25016,8 +25045,8 @@@ f
fi
+ fi
+
ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
if test "x$ac_cv_header_iconv_h" = xyes; then :
@@@ -24738,6 -25122,8 +25151,8 @@@ if test "${enable_staticlink}" != "no"
HAVE_CURL=yes
CURL_LIBS="../../$LIB/lib/libcurl.a -lrt"
+ CURL_CFLAGS="-I../../$LIB/include"
+
else
@@@ -24787,9 -25173,11 +25202,11 @@@ if test "${enable_mpgmad}" != "no"; the
if test "${enable_staticlink}" != "no"; then :
HAVE_MPGMAD=yes
+ MAD_CFLAGS="-I../../$LIB/include"
MAD_LIBS="../../$LIB/lib/libmad.a"
+
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmad" >&5
@@@ -24843,7 -25231,9 +25260,9 @@@ if test "${enable_vorbis}" != "no"; the
if test "${enable_staticlink}" != "no"; then :
HAVE_VORBISPLUGIN=yes
- VORBIS_LIBS="../../$LIB/lib/libogg.a ../../$LIB/lib/libvorbis.a ../../$LIB/lib/libvorbisenc.a ../../$LIB/lib/libvorbisfile.a"
+ VORBIS_LIBS="-lvorbisfile -lvorbis -lm -logg"
+ VORBIS_CFLAGS="-I../../$LIB/include"
+
else
@@@ -24928,12 -25318,109 +25347,109 @@@ f
fi
+ if test "${enable_staticlink}" != "no"; then :
+
+ HAVE_OGG=yes
+ OGG_LIBS="-logg"
+ OGG_CFLAGS="-I../../$LIB/include"
+
+
+
+ else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -logg" >&5
+ $as_echo_n "checking for main in -logg... " >&6; }
+ if ${ac_cv_lib_ogg_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-logg $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+
+ int
+ main ()
+ {
+ return main ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ogg_main=yes
+ else
+ ac_cv_lib_ogg_main=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_main" >&5
+ $as_echo "$ac_cv_lib_ogg_main" >&6; }
+ if test "x$ac_cv_lib_ogg_main" = xyes; then :
+ HAVE_OGG=yes
+ fi
+
+ if test "$HAVE_OGG" = "yes"; then :
+
+ HAVE_VORBISPLUGIN=yes
+ OGG_LIBS="-logg"
+
+
+ fi
+
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ogg_stream_flush_fill in -logg" >&5
+ $as_echo_n "checking for ogg_stream_flush_fill in -logg... " >&6; }
+ if ${ac_cv_lib_ogg_ogg_stream_flush_fill+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-logg $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char ogg_stream_flush_fill ();
+ int
+ main ()
+ {
+ return ogg_stream_flush_fill ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ogg_ogg_stream_flush_fill=yes
+ else
+ ac_cv_lib_ogg_ogg_stream_flush_fill=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_ogg_stream_flush_fill" >&5
+ $as_echo "$ac_cv_lib_ogg_ogg_stream_flush_fill" >&6; }
+ if test "x$ac_cv_lib_ogg_ogg_stream_flush_fill" = xyes; then :
+ HAVE_OGG_STREAM_FLUSH_FILL=yes
+ fi
+
+
if test "${enable_flac}" != "no"; then :
if test "${enable_staticlink}" != "no"; then :
HAVE_FLACPLUGIN=yes
- FLAC_LIBS="../../$LIB/lib/libFLAC.a ../../$LIB/lib/libogg.a"
+ FLAC_CFLAGS="-I../../$LIB/include"
+ FLAC_LIBS="-lFLAC"
+
else
@@@ -24989,9 -25476,11 +25505,11 @@@ if test "${enable_wavpack}" != "no"; th
if test "${enable_staticlink}" != "no"; then :
HAVE_WAVPACKPLUGIN=yes
+ WAVPACK_CFLAGS="-I../../$LIB/include"
WAVPACK_LIBS="../../$LIB/lib/libwavpack.a"
+
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lwavpack" >&5
@@@ -25045,9 -25534,11 +25563,11 @@@ if test "${enable_sndfile}" != "no"; th
if test "${enable_staticlink}" != "no"; then :
HAVE_SNDFILEPLUGIN=yes
+ SNDFILE_CFLAGS="-I../../$LIB/include"
SNDFILE_LIBS="../../$LIB/lib/libsndfile.a"
+
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lsndfile" >&5
@@@ -25103,6 -25594,8 +25623,8 @@@ if test "${enable_vfs_curl}" != "no"; t
HAVE_VFS_CURL=yes
VFS_CURL_LIBS="$CURL_LIBS"
+ VFS_CURL_CFLAGS="$CURL_CFLAGS"
+
fi
@@@ -25232,17 -25725,33 +25754,33 @@@ f
if test "${enable_hotkeys}" != "no"; then :
- ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
+ if test "${enable_staticlink}" != "no"; then :
+
+ HOTKEYS_CFLAGS="-I../../$LIB/include"
+ HOTKEYS_LIBS="-lX11"
+
+
+ HAVE_HOTKEYS=yes
+
+ else
+
+ ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
if test "x$ac_cv_header_X11_Xlib_h" = xyes; then :
HAVE_XLIB_H=yes
fi
- if test "${HAVE_XLIB_H}" = "yes"; then :
+ if test "${HAVE_XLIB_H}" = "yes"; then :
- HOTKEYS_LIBS="-lX11"
+ if test "${HAVE_XLIB_H}" = "yes"; then :
- HAVE_HOTKEYS=yes
+ HOTKEYS_LIBS="-lX11"
+
+ HAVE_HOTKEYS=yes
+
+ fi
+
+ fi
fi
@@@ -25353,6 -25862,15 +25891,15 @@@ if test "${enable_shellexec}" != "no";
fi
+ if test "${enable_shellexecui}" != "no" -a "${enable_shellexec}" != "no"; then :
+
+ if test "${HAVE_GTK2}" = "yes" -o "${HAVE_GTK3}" = "yes"; then :
+
+ HAVE_SHELLEXECUI=yes
+
+ fi
+
+ fi
if test "${enable_artwork}" != "no"; then :
@@@ -25523,9 -26041,15 +26070,15 @@@ f
fi
- if test "${HAVE_VFS_CURL}" = "yes"; then :
+ if test "${enable_artwork_network}" = "yes"; then :
- if test "${HAVE_JPEG}" = "yes" -o "${HAVE_IMLIB2}" == "yes"; then :
+ ARTWORK_USE_VFS_CURL=yes
+
+ fi
+
+ if test "${HAVE_VFS_CURL}" = "yes" -o "${enable_artwork_network}" = "no" ; then :
+
+ if test "${HAVE_JPEG}" = "yes" -o "${HAVE_IMLIB2}" = "yes"; then :
HAVE_ARTWORK=yes
@@@ -25567,8 -26091,10 +26120,10 @@@ if test "${enable_src}" != "no"; then
if test "${enable_staticlink}" != "no"; then :
+ LIBSAMPLERATE_DEPS_CFLAGS="-I../../$LIB/include"
LIBSAMPLERATE_DEPS_LIBS="../../$LIB/lib/libsamplerate.a -lpthread ${DL_LIBS}"
+
HAVE_DSP_SRC=yes
else
@@@ -25710,8 -26236,10 +26265,10 @@@ if test "${enable_aac}" != "no"; then
if test "${enable_staticlink}" != "no"; then :
+ FAAD2_CFLAGS="-I../../$LIB/include"
FAAD2_LIBS="../../$LIB/lib/libfaad.a"
+
HAVE_AAC=yes
else
@@@ -25797,16 -26325,6 +26354,6 @@@ f
fi
- if test "${enable_shellexecui}" != "no"; then :
-
- if test "${HAVE_GTK2}" = "yes" -o "${HAVE_GTK3}" = "yes"; then :
-
- HAVE_SHELLEXECUI=yes
-
- fi
-
- fi
-
if test "${enable_dumb}" != "no"; then :
HAVE_DUMB=yes
@@@ -25849,7 -26367,7 +26396,7 @@@ if test "${enable_pltbrowser}" != "no"
fi
- PLUGINS_DIRS="plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/shellexecui plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio"
+ PLUGINS_DIRS="plugins/liboggedit plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio"
if test "x$APE_USE_YASM" = "xyes"; then
APE_USE_YASM_TRUE=
@@@ -25867,6 -26385,22 +26414,22 @@@ els
HAVE_VORBIS_FALSE=
fi
+ if test "x$HAVE_OGG" = "xyes"; then
+ HAVE_OGG_TRUE=
+ HAVE_OGG_FALSE='#'
+ else
+ HAVE_OGG_TRUE='#'
+ HAVE_OGG_FALSE=
+ fi
+
+ if test "x$HAVE_OGG_STREAM_FLUSH_FILL" = "xyes"; then
+ HAVE_OGG_STREAM_FLUSH_FILL_TRUE=
+ HAVE_OGG_STREAM_FLUSH_FILL_FALSE='#'
+ else
+ HAVE_OGG_STREAM_FLUSH_FILL_TRUE='#'
+ HAVE_OGG_STREAM_FLUSH_FILL_FALSE=
+ fi
+
if test "x$HAVE_FLACPLUGIN" = "xyes"; then
HAVE_FLAC_TRUE=
HAVE_FLAC_FALSE='#'
@@@ -25955,6 -26489,14 +26518,14 @@@ els
HAVE_ARTWORK_FALSE=
fi
+ if test "x$ARTWORK_USE_VFS_CURL" = "xyes"; then
+ ARTWORK_USE_VFS_CURL_TRUE=
+ ARTWORK_USE_VFS_CURL_FALSE='#'
+ else
+ ARTWORK_USE_VFS_CURL_TRUE='#'
+ ARTWORK_USE_VFS_CURL_FALSE=
+ fi
+
if test "x$HAVE_ADPLUG" = "xyes"; then
HAVE_ADPLUG_TRUE=
HAVE_ADPLUG_FALSE='#'
@@@ -26067,6 -26609,14 +26638,14 @@@ els
HAVE_SHELLEXEC_FALSE=
fi
+ if test "x$HAVE_SHELLEXECUI" = "xyes"; then
+ HAVE_SHELLEXECUI_TRUE=
+ HAVE_SHELLEXECUI_FALSE='#'
+ else
+ HAVE_SHELLEXECUI_TRUE='#'
+ HAVE_SHELLEXECUI_FALSE=
+ fi
+
if test "x$HAVE_MUSEPACK" = "xyes"; then
HAVE_MUSEPACK_TRUE=
HAVE_MUSEPACK_FALSE='#'
@@@ -26211,14 -26761,6 +26790,6 @@@ els
HAVE_MONO2STEREO_FALSE=
fi
- if test "x$HAVE_SHELLEXECUI" = "xyes"; then
- HAVE_SHELLEXECUI_TRUE=
- HAVE_SHELLEXECUI_FALSE='#'
- else
- HAVE_SHELLEXECUI_TRUE='#'
- HAVE_SHELLEXECUI_FALSE=
- fi
-
if test "x$HAVE_ALAC" = "xyes"; then
HAVE_ALAC_TRUE=
HAVE_ALAC_FALSE='#'
@@@ -26463,9 -27005,9 +27034,9 @@@ ech
if test "x$HAVE_HOTKEYS" = "xyes" ; then
- echo " hotkeys: yes - Global hotkeys support"
+ echo " hotkeys: yes - Local and global hotkeys support"
else
- echo " hotkeys: no - Global hotkeys support"
+ echo " hotkeys: no - Local and global hotkeys support"
fi
@@@ -26510,6 -27052,14 +27081,14 @@@
+ if test "x$HAVE_SHELLEXECUI" = "xyes" ; then
+ echo " shellexecui: yes - GTK user interface for setting up shellexec plugin"
+ else
+ echo " shellexecui: no - GTK user interface for setting up shellexec plugin"
+ fi
+
+
+
if test "x$HAVE_MUSEPACK" = "xyes" ; then
echo " musepack: yes - musepack player plugin"
else
@@@ -26622,14 -27172,6 +27201,6 @@@
- if test "x$HAVE_SHELLEXECUI" = "xyes" ; then
- echo " shellexecui: yes - GTK user interface for configuring shellexec plugin"
- else
- echo " shellexecui: no - GTK user interface for configuring shellexec plugin"
- fi
-
-
-
if test "x$HAVE_ALAC" = "xyes" ; then
echo " alac: yes - ALAC plugin"
else
@@@ -26656,7 -27198,7 +27227,7 @@@
echo
- ac_config_files="$ac_config_files Makefile pixmaps/Makefile icons/Makefile plugins/libmp4ff/Makefile plugins/libparser/Makefile plugins/gme/Makefile plugins/alsa/Makefile plugins/hotkeys/Makefile plugins/lastfm/Makefile plugins/ffap/Makefile plugins/mpgmad/Makefile plugins/vorbis/Makefile plugins/flac/Makefile plugins/wavpack/Makefile plugins/sndfile/Makefile plugins/vfs_curl/Makefile plugins/cdda/Makefile plugins/gtkui/Makefile plugins/nullout/Makefile plugins/vtx/Makefile plugins/adplug/Makefile plugins/ffmpeg/Makefile plugins/sid/Makefile plugins/oss/Makefile plugins/pulse/Makefile plugins/artwork/Makefile plugins/supereq/Makefile plugins/notify/Makefile plugins/shellexec/Makefile plugins/musepack/Makefile plugins/wildmidi/Makefile plugins/tta/Makefile plugins/dca/Makefile plugins/aac/Makefile plugins/mms/Makefile plugins/dsp_libsrc/Makefile plugins/m3u/Makefile plugins/vfs_zip/Makefile plugins/converter/Makefile plugins/dumb/Makefile plugins/ao/Makefile plugins/shn/Makefile plugins/mono2stereo/Makefile plugins/shellexecui/Makefile plugins/alac/Makefile plugins/wma/Makefile plugins/pltbrowser/Makefile plugins/coreaudio/Makefile intl/Makefile po/Makefile.in deadbeef.desktop"
+ ac_config_files="$ac_config_files Makefile pixmaps/Makefile icons/Makefile plugins/liboggedit/Makefile plugins/libmp4ff/Makefile plugins/libparser/Makefile plugins/gme/Makefile plugins/alsa/Makefile plugins/hotkeys/Makefile plugins/lastfm/Makefile plugins/ffap/Makefile plugins/mpgmad/Makefile plugins/vorbis/Makefile plugins/flac/Makefile plugins/wavpack/Makefile plugins/sndfile/Makefile plugins/vfs_curl/Makefile plugins/cdda/Makefile plugins/gtkui/Makefile plugins/nullout/Makefile plugins/vtx/Makefile plugins/adplug/Makefile plugins/ffmpeg/Makefile plugins/sid/Makefile plugins/oss/Makefile plugins/pulse/Makefile plugins/artwork/Makefile plugins/supereq/Makefile plugins/notify/Makefile plugins/shellexec/Makefile plugins/musepack/Makefile plugins/wildmidi/Makefile plugins/tta/Makefile plugins/dca/Makefile plugins/aac/Makefile plugins/mms/Makefile plugins/dsp_libsrc/Makefile plugins/m3u/Makefile plugins/vfs_zip/Makefile plugins/converter/Makefile plugins/dumb/Makefile plugins/ao/Makefile plugins/shn/Makefile plugins/mono2stereo/Makefile plugins/shellexecui/Makefile plugins/alac/Makefile plugins/wma/Makefile plugins/pltbrowser/Makefile plugins/coreaudio/Makefile intl/Makefile po/Makefile.in deadbeef.desktop"
cat >confcache <<\_ACEOF
@@@ -26768,6 -27310,14 +27339,14 @@@ LIBOBJS=$ac_libobj
LTLIBOBJS=$ac_ltlibobjs
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+ $as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+ $as_echo "done" >&6; }
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@@ -26817,6 -27367,14 +27396,14 @@@ if test -z "${HAVE_VORBIS_TRUE}" && tes
as_fn_error $? "conditional \"HAVE_VORBIS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+ if test -z "${HAVE_OGG_TRUE}" && test -z "${HAVE_OGG_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_OGG\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_OGG_STREAM_FLUSH_FILL_TRUE}" && test -z "${HAVE_OGG_STREAM_FLUSH_FILL_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_OGG_STREAM_FLUSH_FILL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
if test -z "${HAVE_FLAC_TRUE}" && test -z "${HAVE_FLAC_FALSE}"; then
as_fn_error $? "conditional \"HAVE_FLAC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@@ -26861,6 -27419,10 +27448,10 @@@ if test -z "${HAVE_ARTWORK_TRUE}" && te
as_fn_error $? "conditional \"HAVE_ARTWORK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+ if test -z "${ARTWORK_USE_VFS_CURL_TRUE}" && test -z "${ARTWORK_USE_VFS_CURL_FALSE}"; then
+ as_fn_error $? "conditional \"ARTWORK_USE_VFS_CURL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
if test -z "${HAVE_ADPLUG_TRUE}" && test -z "${HAVE_ADPLUG_FALSE}"; then
as_fn_error $? "conditional \"HAVE_ADPLUG\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@@ -26917,6 -27479,10 +27508,10 @@@ if test -z "${HAVE_SHELLEXEC_TRUE}" &&
as_fn_error $? "conditional \"HAVE_SHELLEXEC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+ if test -z "${HAVE_SHELLEXECUI_TRUE}" && test -z "${HAVE_SHELLEXECUI_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_SHELLEXECUI\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
if test -z "${HAVE_MUSEPACK_TRUE}" && test -z "${HAVE_MUSEPACK_FALSE}"; then
as_fn_error $? "conditional \"HAVE_MUSEPACK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@@ -26989,10 -27555,6 +27584,6 @@@ if test -z "${HAVE_MONO2STEREO_TRUE}" &
as_fn_error $? "conditional \"HAVE_MONO2STEREO\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
- if test -z "${HAVE_SHELLEXECUI_TRUE}" && test -z "${HAVE_SHELLEXECUI_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_SHELLEXECUI\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
if test -z "${HAVE_ALAC_TRUE}" && test -z "${HAVE_ALAC_FALSE}"; then
as_fn_error $? "conditional \"HAVE_ALAC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@@ -27418,7 -27980,7 +28009,11 @@@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wr
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
++<<<<<<< HEAD
+This file was extended by deadbeef $as_me 0.6.0, which was
++=======
+ This file was extended by deadbeef $as_me 0.6.2, which was
++>>>>>>> upstream/0.6.2
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@@ -27484,7 -28046,7 +28079,11 @@@ _ACEO
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
++<<<<<<< HEAD
+deadbeef config.status 0.6.0
++=======
+ deadbeef config.status 0.6.2
++>>>>>>> upstream/0.6.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@@ -28002,6 -28564,7 +28601,7 @@@ d
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
"icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
+ "plugins/liboggedit/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/liboggedit/Makefile" ;;
"plugins/libmp4ff/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/libmp4ff/Makefile" ;;
"plugins/libparser/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/libparser/Makefile" ;;
"plugins/gme/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/gme/Makefile" ;;
@@@ -28647,7 -29210,7 +29247,7 @@@ $as_echo "$as_me: executing $ac_file co
case $ac_file$ac_mode in
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@@ -28660,7 -29223,7 +29260,7 @@@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@@ -28694,21 -29257,19 +29294,19 @@@ $as_echo X"$mf"
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`$as_dirname -- "$file" ||
diff --combined configure.ac
index 71d4854,eea4017..0b20d99
--- a/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,9 @@@
dnl Process this file with autoconf to produce a configure script.
++<<<<<<< HEAD
+AC_INIT([deadbeef], [0.6.0])
++=======
+ AC_INIT([deadbeef], [0.6.2])
++>>>>>>> upstream/0.6.2
AC_CONFIG_HEADER(config.h)
@@@ -28,51 -28,44 +32,44 @@@ test "$prefix" = NONE && prefix=/usr/lo
AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/${DATADIRNAME}/locale", [Name of gettext locale directory])
case "$host" in
- *-*-gnu)
- NOCPPLIB="-nostdlib -lsupc++";;
- esac
-
- case "$host" in
i686-apple-*)
AC_DEFINE(ARCH_X86_32, 1, [architecture is x86 on OSX])
- LIB="../deadbeef-deps/lib-x86-32-apple"
+ LIB="static-deps/lib-x86-32-apple"
YASM_FLAGS="-f macho32 -D ARCH_X86_32 -m x86 -DPREFIX"
APE_USE_YASM=yes
OS_OSX=yes
;;
x86_64-apple-*)
AC_DEFINE(ARCH_X86_64, 1, [architecture is x86_64 on OSX])
- LIB="../deadbeef-deps/lib-x86-64-apple"
+ LIB="static-deps/lib-x86-64-apple"
YASM_FLAGS="-f macho64 -D ARCH_X86_64 -m amd64 -DPIC -DPREFIX"
APE_USE_YASM=yes
OS_OSX=yes
;;
i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
AC_DEFINE(ARCH_X86_32, 1, [architecture is x86])
- LIB="../deadbeef-deps/lib-x86-32"
+ LIB="static-deps/lib-x86-32"
YASM_FLAGS="-f elf -D ARCH_X86_32 -m x86"
APE_USE_YASM=yes
;;
x86_64-*-* | amd64-*-*)
AC_DEFINE(ARCH_X86_64, 1, [architecture is x86_64])
- LIB="../deadbeef-deps/lib-x86-64"
+ LIB="static-deps/lib-x86-64"
YASM_FLAGS="-f elf -D ARCH_X86_64 -m amd64"
APE_USE_YASM=yes
- KILLCPPFLAGS="-nostdlib -lsupc++"
;;
powerpc-*-* )
AC_DEFINE(ARCH_PPC_32, 1, [architecture is ppc32])
- LIB="../deadbeef-deps/lib-ppc-32"
+ LIB="static-deps/lib-ppc-32"
;;
powerpc64-*-* )
AC_DEFINE(ARCH_PPC_64, 1, [architecture is ppc64])
- LIB="../deadbeef-deps/lib-ppc-64"
+ LIB="static-deps/lib-ppc-64"
;;
*)
AC_DEFINE(ARCH_UNKNOWN, 1, [architecture is unknown])
;;
esac
- AC_SUBST(NOCPPLIB)
AC_SUBST(LIB)
AC_SUBST(YASM_FLAGS)
@@@ -89,11 -82,12 +86,12 @@@ AC_ARG_ENABLE(alsa, [AS_HELP_STRING
AC_ARG_ENABLE(oss, [AS_HELP_STRING([--disable-oss ], [disable Open Sound System output plugin (default: enabled)])], [enable_oss=$enableval], [enable_oss=yes])
AC_ARG_ENABLE(pulse, [AS_HELP_STRING([--disable-pulse ], [disable PulseAudio output plugin (default: enabled)])], [enable_pulse=$enableval], [enable_pulse=yes])
AC_ARG_ENABLE(coreaudio,[AS_HELP_STRING([--disable-coreaudio], [disable CoreAudio output plugin (default: enabled)])], [enable_coreaudio=$enableval], [enable_coreaudio=yes])
- AC_ARG_ENABLE(gtk3, [AS_HELP_STRING([--disable-gtk3 ], [build GTK3 version of gtkui plugin (default: enabled)])], [enable_gtk3=$enableval], [enable_gtk3=yes])
- AC_ARG_ENABLE(gtk2, [AS_HELP_STRING([--disable-gtk2 ], [build GTK2 version of gtkui plugin (default: enabled)])], [enable_gtk2=$enableval], [enable_gtk2=yes])
+ AC_ARG_ENABLE(gtk3, [AS_HELP_STRING([--disable-gtk3 ], [disable GTK3 version of gtkui plugin (default: enabled)])], [enable_gtk3=$enableval], [enable_gtk3=yes])
+ AC_ARG_ENABLE(gtk2, [AS_HELP_STRING([--disable-gtk2 ], [disable GTK2 version of gtkui plugin (default: enabled)])], [enable_gtk2=$enableval], [enable_gtk2=yes])
AC_ARG_ENABLE(vfs_curl, [AS_HELP_STRING([--disable-vfs-curl], [disable HTTP streaming vfs plugin (default: enabled)])], [enable_vfs_curl=$enableval], [enable_vfs_curl=yes])
AC_ARG_ENABLE(lfm, [AS_HELP_STRING([--disable-lfm ], [disable last.fm/libre.fm scrobbler plugin (default: enabled)])], [enable_lfm=$enableval], [enable_lfm=yes])
AC_ARG_ENABLE(artwork, [AS_HELP_STRING([--disable-artwork ], [disable album art loader plugin (default: enabled)])], [enable_artwork=$enableval], [enable_artwork=yes])
+ AC_ARG_ENABLE(artwork-network, [AS_HELP_STRING([--disable-artwork-network ], [disable album art network loading support (default: enabled)])], [enable_artwork_network=$enableval], [enable_artwork_network=yes])
AC_ARG_ENABLE(supereq, [AS_HELP_STRING([--disable-supereq ], [disable SuperEQ DSP plugin (default: enabled)])], [enable_supereq=$enableval], [enable_supereq=yes])
AC_ARG_ENABLE(sid, [AS_HELP_STRING([--disable-sid ], [disable commodore64 SID music player plugin (default: enabled)])], [enable_sid=$enableval], [enable_sid=yes])
AC_ARG_ENABLE(mad, [AS_HELP_STRING([--disable-mad ], [disable mpeg (mad) plugin (default: enabled)])], [enable_mpgmad=$enableval], [enable_mpgmad=yes])
@@@ -144,6 -138,17 +142,17 @@@ AS_IF([test "${enable_abstract_socket}
USE_ABSTRACT_SOCKET_NAME=yes
])
+ case "$host" in
+ *-*-gnu )
+ AS_IF([test "${enable_staticlink}" != "no"], [
+ NOCPPLIB="-nostdlib ../../$LIB/lib/libsupc++.a"
+ ], [
+ NOCPPLIB=""
+ ])
+ AC_SUBST(NOCPPLIB)
+ ;;
+ esac
+
AC_CHECK_LIB([intl], [main], [INTL_LIBS="-lintl";AC_SUBST(INTL_LIBS)])
dnl check for yasm
@@@ -183,24 -188,32 +192,32 @@@ CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_S
AS_IF([test "${enable_staticlink}" != "no"], [
HAVE_ZLIB=yes
+ ZLIB_CFLAGS="-I../../$LIB/include"
ZLIB_LIBS="../../$LIB/lib/libz.a"
+ AC_SUBST(ZLIB_CFLAGS)
+ AC_SUBST(ZLIB_LIBS)
], [
AC_CHECK_LIB([z], [main], [HAVE_ZLIB=yes])
ZLIB_LIBS="-lz"
+ AC_SUBST(ZLIB_LIBS)
])
- AC_SUBST(ZLIB_LIBS)
AS_IF([test "${enable_staticlink}" != "no"], [
HAVE_ZIP=yes
+ ZIP_CFLAGS="-I../../$LIB/include"
ZIP_LIBS="../../$LIB/lib/libzip.a ../../$LIB/lib/libz.a"
+ AC_SUBST(ZIP_CFLAGS)
+ AC_SUBST(ZIP_LIBS)
], [
- AC_CHECK_LIB([zip], [main], [HAVE_ZIP=yes])
- ZIP_LIBS="-lzip"
+ PKG_CHECK_MODULES(ZIP, libzip, HAVE_ZIP=yes, HAVE_ZIP=no)
])
- AC_SUBST(ZIP_LIBS)
AS_IF([test "${enable_gtk3}" = "yes"], [
AS_IF([test "${enable_staticlink}" != "no"], [
+ GTK3_DEPS_CFLAGS="-I../../${LIB}/gtk-3.0.0/include/gtk-3.0 -I../../${LIB}/gtk-3.0.0/include/pango-1.0 -I../../${LIB}/gtk-3.0.0/include/gio-unix-2.0/ -I../../${LIB}/gtk-3.0.0/include/atk-1.0 -I../../${LIB}/gtk-3.0.0/include/cairo -I../../${LIB}/gtk-3.0.0/include/gdk-pixbuf-2.0 -I../../${LIB}/gtk-3.0.0/include/freetype2 -I../../${LIB}/gtk-3.0.0/include/glib-2.0 -I../../${LIB}/gtk-3.0.0/lib/glib-2.0/include"
+ GTK3_DEPS_LIBS="-L${GTK_ROOT_300}/lib -lgtk-3 -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
+ AC_SUBST(GTK3_DEPS_CFLAGS)
+ AC_SUBST(GTK3_DEPS_LIBS)
HAVE_GTK3=yes
], [
PKG_CHECK_MODULES(GTK3_DEPS, gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0, HAVE_GTK3=yes, HAVE_GTK3=no)
@@@ -220,6 -233,10 +237,10 @@@ AM_CONDITIONAL(OS_OSX, test "x$OS_OSX"
AS_IF([test "${enable_gtk2}" = "yes"], [
AS_IF([test "${enable_staticlink}" != "no"], [
+ GTK2_DEPS_CFLAGS="-I${GTK_ROOT_216}/include/gtk-2.0 -I${GTK_ROOT_216}/lib/gtk-2.0/include -I${GTK_ROOT_216}/include/atk-1.0 -I${GTK_ROOT_216}/include/cairo -I${GTK_ROOT_216}/include/pango-1.0 -I${GTK_ROOT_216}/include -I${GTK_ROOT_216}/include/glib-2.0 -I${GTK_ROOT_216}/lib/glib-2.0/include"
+ GTK2_DEPS_LIBS="-L${GTK_ROOT_216}/lib -lgtk-x11-2.0 -lpango-1.0 -lcairo -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
+ AC_SUBST(GTK2_DEPS_CFLAGS)
+ AC_SUBST(GTK2_DEPS_LIBS)
HAVE_GTK2=yes
], [
PKG_CHECK_MODULES(GTK2_DEPS, gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0, HAVE_GTK2=yes, HAVE_GTK2=no)
@@@ -231,7 -248,16 +252,16 @@@ dnl AC_CHECK_LIB([ICE], [main], [HAV
])
AS_IF([test "${enable_alsa}" != "no"], [
- PKG_CHECK_MODULES(ALSA_DEPS, alsa, HAVE_ALSA=yes, HAVE_ALSA=no)
+ AS_IF([test "${enable_staticlink}" != "no"], [
+ HAVE_ALSA=yes
+ ALSA_DEPS_CFLAGS="-I../../$LIB/include"
+ ALSA_DEPS_LIBS="-lasound"
+ AC_SUBST(ALSA_DEPS_CFLAGS)
+ AC_SUBST(ALSA_DEPS_LIBS)
+ ],
+ [
+ PKG_CHECK_MODULES(ALSA_DEPS, alsa, HAVE_ALSA=yes, HAVE_ALSA=no)
+ ])
])
AC_CHECK_HEADER([CoreAudio/AudioHardware.h], [found_coreaudio_h=yes], [found_coreaudio_h=no])
@@@ -239,7 -265,7 +269,7 @@@
AS_IF([test "${enable_coreaudio}" != "no" -a "${found_coreaudio_h}" != "no"], [
AC_DEFINE(HAVE_COREAUDIO, 1, [Build coreaudio support])
HAVE_COREAUDIO=yes
- COREAUDIO_LIBS="-Wl,-framework,CoreAudio"
+ COREAUDIO_LIBS="-Wl,-framework,CoreAudio -Wl,-framework,AudioUnit"
])
AC_SUBST(COREAUDIO_LIBS)
@@@ -266,7 -292,15 +296,15 @@@ AS_IF([test "${enable_staticlink}" != "
])
AS_IF([test "${enable_pulse}" != "no"], [
- PKG_CHECK_MODULES(PULSE_DEPS, libpulse-simple, HAVE_PULSE=yes, HAVE_PULSE=no)
+ AS_IF([test "${enable_staticlink}" != "no"], [
+ HAVE_PULSE=yes
+ PULSE_DEPS_LIBS="-lpulse-simple"
+ PULSE_DEPS_CFLAGS="-I../../$LIB/include/"
+ AC_SUBST(DBUS_DEPS_CFLAGS)
+ AC_SUBST(DBUS_DEPS_LIBS)
+ ], [
+ PKG_CHECK_MODULES(PULSE_DEPS, libpulse-simple, HAVE_PULSE=yes, HAVE_PULSE=no)
+ ])
])
AC_CHECK_HEADER([iconv.h],[],[iconv.h not found.])
@@@ -287,7 -321,9 +325,9 @@@ dnl curl li
AS_IF([test "${enable_staticlink}" != "no"], [
HAVE_CURL=yes
CURL_LIBS="../../$LIB/lib/libcurl.a -lrt"
+ CURL_CFLAGS="-I../../$LIB/include"
AC_SUBST(CURL_LIBS)
+ AC_SUBST(CURL_CFLAGS)
], [
AC_CHECK_LIB([curl], [main], [HAVE_CURL=yes])
CURL_LIBS="-lcurl"
@@@ -299,7 -335,9 +339,9 @@@ dnl mpgmad plugi
AS_IF([test "${enable_mpgmad}" != "no"], [
AS_IF([test "${enable_staticlink}" != "no"], [
HAVE_MPGMAD=yes
+ MAD_CFLAGS="-I../../$LIB/include"
MAD_LIBS="../../$LIB/lib/libmad.a"
+ AC_SUBST(MAD_CFLAGS)
AC_SUBST(MAD_LIBS)
], [
AC_CHECK_LIB([mad], [main], [HAVE_LIBMAD=yes])
@@@ -315,8 -353,10 +357,10 @@@ dnl vorbis plugi
AS_IF([test "${enable_vorbis}" != "no"], [
AS_IF([test "${enable_staticlink}" != "no"], [
HAVE_VORBISPLUGIN=yes
- VORBIS_LIBS="../../$LIB/lib/libogg.a ../../$LIB/lib/libvorbis.a ../../$LIB/lib/libvorbisenc.a ../../$LIB/lib/libvorbisfile.a"
+ VORBIS_LIBS="-lvorbisfile -lvorbis -lm -logg"
+ VORBIS_CFLAGS="-I../../$LIB/include"
AC_SUBST(VORBIS_LIBS)
+ AC_SUBST(VORBIS_CFLAGS)
], [
AC_CHECK_LIB([vorbis], [main], [HAVE_VORBIS=yes])
AC_CHECK_LIB([vorbisfile], [main], [HAVE_VORBISFILE=yes])
@@@ -328,11 -368,31 +372,31 @@@
])
])
+ dnl libogg for oggedit
+ AS_IF([test "${enable_staticlink}" != "no"], [
+ HAVE_OGG=yes
+ OGG_LIBS="-logg"
+ OGG_CFLAGS="-I../../$LIB/include"
+ AC_SUBST(OGG_LIBS)
+ AC_SUBST(OGG_CFLAGS)
+ ], [
+ AC_CHECK_LIB([ogg], [main], [HAVE_OGG=yes])
+ AS_IF([test "$HAVE_OGG" = "yes"], [
+ HAVE_VORBISPLUGIN=yes
+ OGG_LIBS="-logg"
+ AC_SUBST(OGG_LIBS)
+ ])
+ ])
+
+ AC_CHECK_LIB([ogg], [ogg_stream_flush_fill], [HAVE_OGG_STREAM_FLUSH_FILL=yes])
+
dnl flac plugin
AS_IF([test "${enable_flac}" != "no"], [
AS_IF([test "${enable_staticlink}" != "no"], [
HAVE_FLACPLUGIN=yes
- FLAC_LIBS="../../$LIB/lib/libFLAC.a ../../$LIB/lib/libogg.a"
+ FLAC_CFLAGS="-I../../$LIB/include"
+ FLAC_LIBS="-lFLAC"
+ AC_SUBST(FLAC_CFLAGS)
AC_SUBST(FLAC_LIBS)
], [
AC_CHECK_LIB([FLAC], [main], [HAVE_FLAC=yes])
@@@ -348,7 -408,9 +412,9 @@@ dnl wavpack plugi
AS_IF([test "${enable_wavpack}" != "no"], [
AS_IF([test "${enable_staticlink}" != "no"], [
HAVE_WAVPACKPLUGIN=yes
+ WAVPACK_CFLAGS="-I../../$LIB/include"
WAVPACK_LIBS="../../$LIB/lib/libwavpack.a"
+ AC_SUBST(WAVPACK_CFLAGS)
AC_SUBST(WAVPACK_LIBS)
], [
AC_CHECK_LIB([wavpack], [main], [HAVE_WAVPACK=yes])
@@@ -364,7 -426,9 +430,9 @@@ dnl libsndfile plugi
AS_IF([test "${enable_sndfile}" != "no"], [
AS_IF([test "${enable_staticlink}" != "no"], [
HAVE_SNDFILEPLUGIN=yes
+ SNDFILE_CFLAGS="-I../../$LIB/include"
SNDFILE_LIBS="../../$LIB/lib/libsndfile.a"
+ AC_SUBST(SNDFILE_CFLAGS)
AC_SUBST(SNDFILE_LIBS)
], [
AC_CHECK_LIB([sndfile], [main], [HAVE_SNDFILE=yes])
@@@ -382,6 -446,8 +450,8 @@@ AS_IF([test "${enable_vfs_curl}" != "no
HAVE_VFS_CURL=yes
VFS_CURL_LIBS="$CURL_LIBS"
AC_SUBST(VFS_CURL_LIBS)
+ VFS_CURL_CFLAGS="$CURL_CFLAGS"
+ AC_SUBST(VFS_CURL_CFLAGS)
])
])
@@@ -420,11 -486,22 +490,22 @@@ AS_IF([test "${enable_ffmpeg}" != "no"]
])
AS_IF([test "${enable_hotkeys}" != "no"], [
- AC_CHECK_HEADER([X11/Xlib.h], HAVE_XLIB_H=yes)
- AS_IF([test "${HAVE_XLIB_H}" = "yes"], [
+ AS_IF([test "${enable_staticlink}" != "no"], [
+ HOTKEYS_CFLAGS="-I../../$LIB/include"
HOTKEYS_LIBS="-lX11"
+ AC_SUBST(HOTKEYS_CFLAGS)
AC_SUBST(HOTKEYS_LIBS)
HAVE_HOTKEYS=yes
+ ],
+ [
+ AC_CHECK_HEADER([X11/Xlib.h], HAVE_XLIB_H=yes)
+ AS_IF([test "${HAVE_XLIB_H}" = "yes"], [
+ AS_IF([test "${HAVE_XLIB_H}" = "yes"], [
+ HOTKEYS_LIBS="-lX11"
+ AC_SUBST(HOTKEYS_LIBS)
+ HAVE_HOTKEYS=yes
+ ])
+ ])
])
])
@@@ -490,6 -567,11 +571,11 @@@ AS_IF([test "${enable_shellexec}" != "n
HAVE_SHELLEXEC=yes
])
+ AS_IF([test "${enable_shellexecui}" != "no" -a "${enable_shellexec}" != "no"], [
+ AS_IF([test "${HAVE_GTK2}" = "yes" -o "${HAVE_GTK3}" = "yes"], [
+ HAVE_SHELLEXECUI=yes
+ ])
+ ])
AS_IF([test "${enable_artwork}" != "no"], [
AS_IF([test "${enable_staticlink}" != "no"], [
@@@ -515,8 -597,12 +601,12 @@@
])
])
- AS_IF([test "${HAVE_VFS_CURL}" = "yes"], [
- AS_IF([test "${HAVE_JPEG}" = "yes" -o "${HAVE_IMLIB2}" == "yes"], [
+ AS_IF([test "${enable_artwork_network}" = "yes"], [
+ ARTWORK_USE_VFS_CURL=yes
+ ])
+
+ AS_IF([test "${HAVE_VFS_CURL}" = "yes" -o "${enable_artwork_network}" = "no" ], [
+ AS_IF([test "${HAVE_JPEG}" = "yes" -o "${HAVE_IMLIB2}" = "yes"], [
HAVE_ARTWORK=yes
])
])
@@@ -542,7 -628,9 +632,9 @@@ AS_IF([test "${enable_nullout}" != "no"
AS_IF([test "${enable_src}" != "no"], [
AS_IF([test "${enable_staticlink}" != "no"], [
+ LIBSAMPLERATE_DEPS_CFLAGS="-I../../$LIB/include"
LIBSAMPLERATE_DEPS_LIBS="../../$LIB/lib/libsamplerate.a -lpthread ${DL_LIBS}"
+ AC_SUBST(LIBSAMPLERATE_DEPS_CFLAGS)
AC_SUBST(LIBSAMPLERATE_DEPS_LIBS)
HAVE_DSP_SRC=yes
], [
@@@ -591,7 -679,9 +683,9 @@@ AS_IF([test "${enable_dca}" != "no"],
AS_IF([test "${enable_aac}" != "no"], [
AS_IF([test "${enable_staticlink}" != "no"], [
+ FAAD2_CFLAGS="-I../../$LIB/include"
FAAD2_LIBS="../../$LIB/lib/libfaad.a"
+ AC_SUBST(FAAD2_CFLAGS)
AC_SUBST(FAAD2_LIBS)
HAVE_AAC=yes
], [
@@@ -630,12 -720,6 +724,6 @@@ dnl AS_IF([test "${enable_medialib}" !
dnl HAVE_MEDIALIB=yes
dnl ])
- AS_IF([test "${enable_shellexecui}" != "no"], [
- AS_IF([test "${HAVE_GTK2}" = "yes" -o "${HAVE_GTK3}" = "yes"], [
- HAVE_SHELLEXECUI=yes
- ])
- ])
-
AS_IF([test "${enable_dumb}" != "no"], [
HAVE_DUMB=yes
])
@@@ -664,10 -748,12 +752,12 @@@ AS_IF([test "${enable_pltbrowser}" != "
HAVE_PLTBROWSER=yes
])
- PLUGINS_DIRS="plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/shellexecui plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio"
+ PLUGINS_DIRS="plugins/liboggedit plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio"
AM_CONDITIONAL(APE_USE_YASM, test "x$APE_USE_YASM" = "xyes")
AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes")
+ AM_CONDITIONAL(HAVE_OGG, test "x$HAVE_OGG" = "xyes")
+ AM_CONDITIONAL(HAVE_OGG_STREAM_FLUSH_FILL, test "x$HAVE_OGG_STREAM_FLUSH_FILL" = "xyes")
AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes")
AM_CONDITIONAL(HAVE_WAVPACK, test "x$HAVE_WAVPACKPLUGIN" = "xyes")
AM_CONDITIONAL(HAVE_SNDFILE, test "x$HAVE_SNDFILEPLUGIN" = "xyes")
@@@ -679,6 -765,7 +769,7 @@@ AM_CONDITIONAL(HAVE_COREAUDIO, test "x$
AM_CONDITIONAL(HAVE_FFMPEG, test "x$HAVE_FFMPEGPLUGIN" = "xyes")
AM_CONDITIONAL(HAVE_PULSE, test "x$HAVE_PULSEPLUGIN" = "xyes")
AM_CONDITIONAL(HAVE_ARTWORK, test "x$HAVE_ARTWORK" = "xyes")
+ AM_CONDITIONAL(ARTWORK_USE_VFS_CURL, test "x$ARTWORK_USE_VFS_CURL" = "xyes")
AM_CONDITIONAL(HAVE_ADPLUG, test "x$HAVE_ADPLUG" = "xyes")
AM_CONDITIONAL(HAVE_FFAP, test "x$HAVE_FFAP" = "xyes")
AM_CONDITIONAL(HAVE_SID, test "x$HAVE_SID" = "xyes")
@@@ -693,6 -780,7 +784,7 @@@ AM_CONDITIONAL(HAVE_OSS, test "x$HAVE_O
AM_CONDITIONAL(HAVE_SUPEREQ, test "x$HAVE_SUPEREQ" = "xyes")
AM_CONDITIONAL(HAVE_NOTIFY, test "x$HAVE_NOTIFY" = "xyes")
AM_CONDITIONAL(HAVE_SHELLEXEC, test "x$HAVE_SHELLEXEC" = "xyes")
+ AM_CONDITIONAL(HAVE_SHELLEXECUI, test "x$HAVE_SHELLEXECUI" = "xyes")
AM_CONDITIONAL(HAVE_MUSEPACK, test "x$HAVE_MUSEPACK" = "xyes")
AM_CONDITIONAL(HAVE_WILDMIDI, test "x$HAVE_WILDMIDI" = "xyes")
AM_CONDITIONAL(HAVE_TTA, test "x$HAVE_TTA" = "xyes")
@@@ -712,7 -800,6 +804,6 @@@ AM_CONDITIONAL(HAVE_DUMB, test "x$HAVE_
AM_CONDITIONAL(HAVE_PSF, test "x$HAVE_PSF" = "xyes")
AM_CONDITIONAL(HAVE_SHN, test "x$HAVE_SHN" = "xyes")
AM_CONDITIONAL(HAVE_MONO2STEREO, test "x$HAVE_MONO2STEREO" = "xyes")
- AM_CONDITIONAL(HAVE_SHELLEXECUI, test "x$HAVE_SHELLEXECUI" = "xyes")
dnl AM_CONDITIONAL(HAVE_SM, test "x$HAVE_SM" = "xyes")
dnl AM_CONDITIONAL(HAVE_ICE, test "x$HAVE_ICE" = "xyes")
AM_CONDITIONAL(HAVE_ALAC, test "x$HAVE_ALAC" = "xyes")
@@@ -768,12 -855,13 +859,13 @@@ PRINT_PLUGIN_INFO([vfs_curl],[http/ftp
PRINT_PLUGIN_INFO([cdda],[cd audio player],[test "x$HAVE_CDDAPLUGIN" = "xyes"])
PRINT_PLUGIN_INFO([gtkui],[GTK2 user interface],[test "x$HAVE_GTK2" = "xyes"])
PRINT_PLUGIN_INFO([gtkui3],[GTK3 user interface],[test "x$HAVE_GTK3" = "xyes"])
- PRINT_PLUGIN_INFO([hotkeys],[Global hotkeys support],[test "x$HAVE_HOTKEYS" = "xyes"])
+ PRINT_PLUGIN_INFO([hotkeys],[Local and global hotkeys support],[test "x$HAVE_HOTKEYS" = "xyes"])
PRINT_PLUGIN_INFO([ffmpeg],[ffmpeg codecs],[test "x$HAVE_FFMPEGPLUGIN" = "xyes"])
PRINT_PLUGIN_INFO([artwork],[Cover art plugin],[test "x$HAVE_ARTWORK" = "xyes"])
PRINT_PLUGIN_INFO([supereq],[Equalizer based on Super EQ library by Naoki Shibata],[test "x$HAVE_SUPEREQ" = "xyes"])
PRINT_PLUGIN_INFO([notify],[notification-daemon support plugin],[test "x$HAVE_NOTIFY" = "xyes"])
PRINT_PLUGIN_INFO([shellexec],[shell commands plugin],[test "x$HAVE_SHELLEXEC" = "xyes"])
+ PRINT_PLUGIN_INFO([shellexecui],[GTK user interface for setting up shellexec plugin],[test "x$HAVE_SHELLEXECUI" = "xyes"])
PRINT_PLUGIN_INFO([musepack],[musepack player plugin],[test "x$HAVE_MUSEPACK" = "xyes"])
PRINT_PLUGIN_INFO([wildmidi],[WildMidi player plugin],[test "x$HAVE_WILDMIDI" = "xyes"])
PRINT_PLUGIN_INFO([tta],[TTA player plugin],[test "x$HAVE_TTA" = "xyes"])
@@@ -789,7 -877,6 +881,6 @@@ PRINT_PLUGIN_INFO([psf],[PSF format plu
PRINT_PLUGIN_INFO([dumb],[DUMB module plugin, for MOD, S3M, etc],[test "x$HAVE_DUMB" = "xyes"])
PRINT_PLUGIN_INFO([shn],[SHN plugin based on xmms-shn],[test "x$HAVE_SHN" = "xyes"])
PRINT_PLUGIN_INFO([mono2stereo],[mono2stereo DSP plugin],[test "x$HAVE_MONO2STEREO" = "xyes"])
- PRINT_PLUGIN_INFO([shellexecui],[GTK user interface for configuring shellexec plugin],[test "x$HAVE_SHELLEXECUI" = "xyes"])
PRINT_PLUGIN_INFO([alac],[ALAC plugin],[test "x$HAVE_ALAC" = "xyes"])
PRINT_PLUGIN_INFO([wma],[WMA plugin],[test "x$HAVE_WMA" = "xyes"])
PRINT_PLUGIN_INFO([pltbrowser],[playlist browser gui plugin],[test "x$HAVE_PLTBROWSER" = "xyes"])
@@@ -800,6 -887,7 +891,7 @@@ AC_CONFIG_FILES(
Makefile
pixmaps/Makefile
icons/Makefile
+ plugins/liboggedit/Makefile
plugins/libmp4ff/Makefile
plugins/libparser/Makefile
plugins/gme/Makefile
diff --combined deadbeef.h
index e179cb3,02c5086..7afad56
--- a/deadbeef.h
+++ b/deadbeef.h
@@@ -71,6 -71,8 +71,8 @@@ extern "C"
// api version history:
// 9.9 -- devel
+ // 1.7 -- deadbeef-0.6.2
+ // 1.6 -- deadbeef-0.6.1
// 1.5 -- deadbeef-0.6
// 1.4 -- deadbeef-0.5.5
// 1.3 -- deadbeef-0.5.3
@@@ -90,44 -92,69 +92,69 @@@
// 0.1 -- deadbeef-0.2.0
#define DB_API_VERSION_MAJOR 1
- #define DB_API_VERSION_MINOR 5
+ #define DB_API_VERSION_MINOR 7
+
+ #define DDB_DEPRECATED(x)
+
+ #ifdef __GNUC__
+ // avoid including glibc headers, this is not very portable
+ #if defined __GNUC__ && defined __GNUC_MINOR__
+ # define __GNUC_PREREQ(maj, min) \
+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+ #else
+ # define __GNUC_PREREQ(maj, min) 0
+ #endif
+ #undef DDB_DEPRECATED
+ #if __GNUC_PREREQ(4,5)
+ #define DDB_DEPRECATED(x) __attribute__ ((deprecated(x)))
+ #else
+ #define DDB_DEPRECATED(x) __attribute__ ((deprecated))
+ #endif
+ #endif
+
#ifndef DDB_API_LEVEL
#define DDB_API_LEVEL DB_API_VERSION_MINOR
#endif
+ #if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 6)
+ #define DEPRECATED_16 DDB_DEPRECATED("since deadbeef API 1.6")
+ #else
+ #define DEPRECATED_16
+ #endif
+
#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 5)
- #define DEPRECATED_15 __attribute__ ((deprecated("since deadbeef API 1.5")))
+ #define DEPRECATED_15 DDB_DEPRECATED("since deadbeef API 1.5")
#else
#define DEPRECATED_15
#endif
#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 4)
- #define DEPRECATED_14 __attribute__ ((deprecated("since deadbeef API 1.4")))
+ #define DEPRECATED_14 DDB_DEPRECATED("since deadbeef API 1.4")
#else
#define DEPRECATED_14
#endif
#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 3)
- #define DEPRECATED_13 __attribute__ ((deprecated("since deadbeef API 1.3")))
+ #define DEPRECATED_13 DDB_DEPRECATED("since deadbeef API 1.3")
#else
#define DEPRECATED_13
#endif
#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 2)
- #define DEPRECATED_12 __attribute__ ((deprecated("since deadbeef API 1.2")))
+ #define DEPRECATED_12 DDB_DEPRECATED("since deadbeef API 1.2")
#else
#define DEPRECATED_12
#endif
#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 1)
- #define DEPRECATED_11 __attribute__ ((deprecated("since deadbeef API 1.1")))
+ #define DEPRECATED_11 DDB_DEPRECATED("since deadbeef API 1.1")
#else
#define DEPRECATED_11
#endif
#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 0)
- #define DEPRECATED __attribute__ ((deprecated))
+ #define DEPRECATED DDB_DEPRECATED
#else
#define DEPRECATED
#endif
@@@ -1000,6 -1027,11 +1027,14 @@@ typedef struct
// deselect all tracks in playlist
void (*plt_deselect_all) (ddb_playlist_t *plt);
++<<<<<<< HEAD
++=======
+ #endif
+ // since 1.6
+ #if (DDB_API_LEVEL >= 6)
+ void (*plt_set_scroll) (ddb_playlist_t *plt, int scroll);
+ int (*plt_get_scroll) (ddb_playlist_t *plt);
++>>>>>>> upstream/0.6.2
#endif
} DB_functions_t;
@@@ -1111,7 -1143,7 +1146,7 @@@ typedef struct DB_plugin_s
// can be NULL
// NOTE for GUI plugin developers: don't initialize your widgets/windows in
// the connect method. look for up-to-date information on wiki:
- // http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Porting_GUI_plugins_to_0.6
+ // http://github.com/Alexey-Yakovenko/deadbeef/wiki/Porting-GUI-plugins-to-deadbeef-from-0.5.x-to-0.6.0
int (*connect) (void);
// opposite of connect, will be called before stop, while all plugins are still
@@@ -1221,6 -1253,15 +1256,15 @@@ typedef struct DB_decoder_s
// NULL terminated array of all supported prefixes (UADE support needs that)
// e.g. "mod.song_title"
const char **prefixes;
+
+ #if (DDB_API_LEVEL >= 7)
+ // This function's purpose is to open the file, so that the file handle is
+ // immediately accessible via DB_fileinfo_t, and can be used with fabort.
+ // If a plugin is using open2, it should not reopen the file from init.
+ // Plugins _must_ implement open even if open2 is present,
+ // because existing code may rely on it.
+ DB_fileinfo_t *(*open2) (uint32_t hints, DB_playItem_t *it);
+ #endif
} DB_decoder_t;
// output plugin
@@@ -1349,8 -1390,15 +1393,15 @@@ typedef struct DB_vfs_s
// in icy protocol
void (*set_track) (DB_FILE *f, DB_playItem_t *it);
- // folder access, follows dirent API, and uses dirent data structures
+ // folder access, follows dirent API, and uses dirent data structures
int (*scandir) (const char *dir, struct dirent ***namelist, int (*selector) (const struct dirent *), int (*cmp) (const struct dirent **, const struct dirent **));
+
+ #if (DDB_API_LEVEL >= 6)
+ // returns URI scheme for a given file name, e.g. "zip://"
+ // can be NULL
+ // can return NULL
+ const char *(*get_scheme_for_name) (const char *fname);
+ #endif
} DB_vfs_t;
// gui plugin
@@@ -1359,7 -1407,7 +1410,7 @@@
// this structure represents a gui dialog with callbacks to set/get params
// documentation should be available here:
- // https://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Development:Gui_Script
+ // http://github.com/Alexey-Yakovenko/deadbeef/wiki/GUI-Script-Syntax
typedef struct {
const char *title;
const char *layout;
@@@ -1407,6 -1455,9 +1458,9 @@@ typedef struct DB_playlist_s
#endif
} DB_playlist_t;
+ #undef DDB_DEPRECATED
+ #undef DEPRECATED
+
#ifdef __cplusplus
}
#endif
diff --combined icons/Makefile.in
index e7aae2d,62ed915..5720705
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,7 +103,7 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = icons
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -80,6 -107,18 +131,18 @@@ mkinstalldirs = $(install_sh) -
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
SOURCES =
DIST_SOURCES =
am__can_run_installinfo = \
@@@ -125,6 -164,7 +188,7 @@@ DATA = $(icon128_DATA) $(icon16_DATA) $
$(icon24_DATA) $(icon256_DATA) $(icon32_DATA) $(icon36_DATA) \
$(icon48_DATA) $(icon64_DATA) $(icon72_DATA) $(icon96_DATA) \
$(iconscalable_DATA)
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
@@@ -149,6 -189,7 +213,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -169,10 -210,12 +234,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -195,6 -238,7 +262,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -248,6 -292,7 +316,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -266,6 -311,8 +335,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -291,13 -338,17 +362,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -306,7 -357,9 +381,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -704,11 -757,11 +781,11 @@@ uninstall-iconscalableDATA
@list='$(iconscalable_DATA)'; test -n "$(iconscalabledir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(iconscalabledir)'; $(am__uninstall_files_from_dir)
- tags: TAGS
- TAGS:
+ tags TAGS:
+
+ ctags CTAGS:
- ctags: CTAGS
- CTAGS:
+ cscope cscopelist:
distdir: $(DISTFILES)
@@@ -856,25 -909,25 +933,25 @@@ uninstall-am: uninstall-icon128DATA uni
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-icon128DATA install-icon16DATA install-icon192DATA \
- install-icon22DATA install-icon24DATA install-icon256DATA \
- install-icon32DATA install-icon36DATA install-icon48DATA \
- install-icon64DATA install-icon72DATA install-icon96DATA \
- install-iconscalableDATA install-info install-info-am \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am uninstall uninstall-am uninstall-icon128DATA \
- uninstall-icon16DATA uninstall-icon192DATA \
- uninstall-icon22DATA uninstall-icon24DATA \
- uninstall-icon256DATA uninstall-icon32DATA \
- uninstall-icon36DATA uninstall-icon48DATA uninstall-icon64DATA \
- uninstall-icon72DATA uninstall-icon96DATA \
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-icon128DATA install-icon16DATA \
+ install-icon192DATA install-icon22DATA install-icon24DATA \
+ install-icon256DATA install-icon32DATA install-icon36DATA \
+ install-icon48DATA install-icon64DATA install-icon72DATA \
+ install-icon96DATA install-iconscalableDATA install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-icon128DATA uninstall-icon16DATA \
+ uninstall-icon192DATA uninstall-icon22DATA \
+ uninstall-icon24DATA uninstall-icon256DATA \
+ uninstall-icon32DATA uninstall-icon36DATA uninstall-icon48DATA \
+ uninstall-icon64DATA uninstall-icon72DATA uninstall-icon96DATA \
uninstall-iconscalableDATA
diff --combined ltmain.sh
index b9205ee,a356aca..a0805d7
--- a/ltmain.sh
+++ b/ltmain.sh
@@@ -70,7 -70,7 +70,11 @@@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
++<<<<<<< HEAD
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
++=======
+ # $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
++>>>>>>> upstream/0.6.2
# automake: $automake_version
# autoconf: $autoconf_version
#
@@@ -80,7 -80,7 +84,11 @@@
PROGRAM=libtool
PACKAGE=libtool
++<<<<<<< HEAD
+VERSION="2.4.2 Debian-2.4.2-1.2ubuntu1"
++=======
+ VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
++>>>>>>> upstream/0.6.2
TIMESTAMP=""
package_revision=1.3337
diff --combined pixmaps/Makefile.in
index 8d444e1,255a66f..77558b7
--- a/pixmaps/Makefile.in
+++ b/pixmaps/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,7 +103,7 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = pixmaps
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -80,6 -107,18 +131,18 @@@ mkinstalldirs = $(install_sh) -
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
SOURCES =
DIST_SOURCES =
am__can_run_installinfo = \
@@@ -116,6 -155,7 +179,7 @@@ am__uninstall_files_from_dir = {
}
am__installdirs = "$(DESTDIR)$(pixmapsdir)"
DATA = $(pixmaps_DATA)
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
@@@ -140,6 -180,7 +204,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -160,10 -201,12 +225,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -186,6 -229,7 +253,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -239,6 -283,7 +307,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -257,6 -302,8 +326,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -282,13 -329,17 +353,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -297,7 -348,9 +372,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -423,11 -476,11 +500,11 @@@ uninstall-pixmapsDATA
@list='$(pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(pixmapsdir)'; $(am__uninstall_files_from_dir)
- tags: TAGS
- TAGS:
+ tags TAGS:
+
+ ctags CTAGS:
- ctags: CTAGS
- CTAGS:
+ cscope cscopelist:
distdir: $(DISTFILES)
@@@ -566,16 -619,16 +643,16 @@@ uninstall-am: uninstall-pixmapsDAT
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pixmapsDATA install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pixmapsDATA
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pixmapsDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags-am uninstall uninstall-am uninstall-pixmapsDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined playlist.c
index 3cf80da,4132fd9..44d8209
--- a/playlist.c
+++ b/playlist.c
@@@ -61,6 -61,11 +61,11 @@@
#include "metacache.h"
#include "volume.h"
#include "pltmeta.h"
+ #include "escape.h"
+ #include "strdupa.h"
+
+ // disable custom title function, until we have new title formatting (0.7)
+ #define DISABLE_CUSTOM_TITLE
#define DISABLE_LOCKING 0
#define DEBUG_LOCKING 0
@@@ -103,7 -108,6 +108,6 @@@ static int plt_loading = 0; // disable
#if !DISABLE_LOCKING
static uintptr_t mutex;
- static uintptr_t mutex_plt;
#endif
#define LOCK {pl_lock();}
@@@ -163,7 -167,6 +167,6 @@@ pl_init (void)
playlist = &dummy_playlist;
#if !DISABLE_LOCKING
mutex = mutex_create ();
- mutex_plt = mutex_create ();
#endif
return 0;
}
@@@ -193,10 -196,6 +196,6 @@@ pl_free (void)
mutex_free (mutex);
mutex = 0;
}
- if (mutex_plt) {
- mutex_free (mutex_plt);
- mutex_plt = 0;
- }
#endif
playlist = NULL;
}
@@@ -263,8 -262,12 +262,12 @@@ plt_gen_conf (void)
playlist_t *p = playlists_head;
for (i = 0; i < cnt; i++, p = p->next) {
char s[100];
- snprintf (s, sizeof (s), "playlist.tab.%02d", i);
+ snprintf (s, sizeof (s), "playlist.tab.%05d", i);
conf_set_str (s, p->title);
+ snprintf (s, sizeof (s), "playlist.cursor.%d", i);
+ conf_set_int (s, p->current_row[PL_MAIN]);
+ snprintf (s, sizeof (s), "playlist.scroll.%d", i);
+ conf_set_int (s, p->scroll);
}
UNLOCK;
}
@@@ -373,10 -376,6 +376,6 @@@ in
plt_add (int before, const char *title) {
assert (before >= 0);
trace ("plt_add\n");
- if (plt_get_count () >= 100) {
- fprintf (stderr, "can't create more than 100 playlists. sorry.\n");
- return -1;
- }
playlist_t *plt = plt_alloc (title);
plt_modified (plt);
@@@ -840,7 -839,7 +839,7 @@@ pl_cue_skipspaces (const uint8_t *p)
}
static void
- pl_get_qvalue_from_cue (const uint8_t *p, int sz, char *out) {
+ pl_get_qvalue_from_cue (const uint8_t *p, int sz, char *out, const char *charset) {
char *str = out;
if (*p == 0) {
*out = 0;
@@@ -873,15 -872,22 +872,22 @@@
out++;
*out = 0;
}
- const char *charset = junk_detect_charset (str);
+
if (!charset) {
return;
}
+
// recode
int l = strlen (str);
- char in[l+1];
- memcpy (in, str, l+1);
- junk_recode (in, l, str, sz, charset);
+ char recbuf[l*10];
+ int res = junk_recode (str, l, recbuf, sizeof (recbuf)-1, charset);
+ if (res > 0) {
+ strcpy (str, recbuf);
+ }
+ else
+ {
+ strcpy (str, "<UNRECOGNIZED CHARSET>");
+ }
}
static void
@@@ -917,7 -923,7 +923,7 @@@ pl_cue_parse_time (const char *p)
}
static playItem_t *
- plt_process_cue_track (playlist_t *playlist, const char *fname, playItem_t **prev, char *track, char *index00, char *index01, char *pregap, char *title, char *albumperformer, char *performer, char *albumtitle, char *genre, char *date, char *replaygain_album_gain, char *replaygain_album_peak, char *replaygain_track_gain, char *replaygain_track_peak, const char *decoder_id, const char *ftype, int samplerate) {
+ plt_process_cue_track (playlist_t *playlist, const char *fname, const int startsample, playItem_t **prev, char *track, char *index00, char *index01, char *pregap, char *title, char *albumperformer, char *performer, char *albumtitle, char *genre, char *date, char *replaygain_album_gain, char *replaygain_album_peak, char *replaygain_track_gain, char *replaygain_track_peak, const char *decoder_id, const char *ftype, int samplerate) {
if (!track[0]) {
trace ("pl_process_cue_track: invalid track (file=%s, title=%s)\n", fname, title);
return NULL;
@@@ -960,14 -966,14 +966,14 @@@
trace ("pl_process_cue_track: invalid pregap or index01 (pregap=%s, index01=%s)\n", pregap, index01);
return NULL;
}
- (*prev)->endsample = (prevtime * samplerate) - 1;
+ (*prev)->endsample = startsample + (prevtime * samplerate) - 1;
plt_set_item_duration (playlist, *prev, (float)((*prev)->endsample - (*prev)->startsample + 1) / samplerate);
if (pl_get_item_duration (*prev) < 0) {
// might be bad cuesheet file, try to fix
trace ("cuesheet seems to be corrupted, trying workaround\n");
//trace ("[bad:] calc endsample=%d, prevtime=%f, samplerate=%d, prev track duration=%f\n", (*prev)->endsample, prevtime, samplerate, (*prev)->duration);
prevtime = f_index01;
- (*prev)->endsample = (prevtime * samplerate) - 1;
+ (*prev)->endsample = startsample + (prevtime * samplerate) - 1;
float dur = (float)((*prev)->endsample - (*prev)->startsample + 1) / samplerate;
plt_set_item_duration (playlist, *prev, dur);
if (dur > 0) {
@@@ -987,7 -993,7 +993,7 @@@
}
playItem_t *it = pl_item_alloc_init (fname, decoder_id);
pl_set_meta_int (it, ":TRACKNUM", atoi (track));
- it->startsample = index01[0] ? f_index01 * samplerate : 0;
+ it->startsample = index01[0] ? startsample + f_index01 * samplerate : startsample;
it->endsample = -1; // will be filled by next read, or by decoder
pl_replace_meta (it, ":FILETYPE", ftype);
if (performer[0]) {
@@@ -1033,11 -1039,33 +1039,33 @@@
playItem_t *
plt_insert_cue_from_buffer (playlist_t *playlist, playItem_t *after, playItem_t *origin, const uint8_t *buffer, int buffersize, int numsamples, int samplerate) {
- LOCK;
if (buffersize >= 3 && buffer[0] == 0xef && buffer[1] == 0xbb && buffer[2] == 0xbf) {
buffer += 3;
buffersize -= 3;
}
+
+ // go through the file, and verify that it's not for multiple tracks
+ int fcount = 0;
+ uint8_t *p = (uint8_t *)buffer;
+ uint8_t *e = (uint8_t *)(buffer + buffersize);
+ while (*p) {
+ while (*p <= 0x20 && *p) {
+ p++;
+ }
+ if (e-p > 4 && !memcmp ((char *)p, "FILE", 4) && p[4] == 0x20) {
+ fcount++;
+ if (fcount > 1) {
+ return NULL;
+ }
+ }
+ while (*p >= 0x20 && *p) {
+ p++;
+ }
+ }
+
+ const char *charset = junk_detect_charset_len (buffer, buffersize);
+
+ LOCK;
playItem_t *ins = after;
trace ("plt_insert_cue_from_buffer numsamples=%d, samplerate=%d\n", numsamples, samplerate);
char albumperformer[256] = "";
@@@ -1086,25 -1114,25 +1114,25 @@@
// trace ("cue line: %s\n", p);
if (!strncmp (p, "PERFORMER ", 10)) {
if (!track[0]) {
- pl_get_qvalue_from_cue (p + 10, sizeof (albumperformer), albumperformer);
+ pl_get_qvalue_from_cue (p + 10, sizeof (albumperformer), albumperformer, charset);
}
else {
- pl_get_qvalue_from_cue (p + 10, sizeof (performer), performer);
+ pl_get_qvalue_from_cue (p + 10, sizeof (performer), performer, charset);
}
trace ("cue: got performer: %s\n", performer);
}
else if (!strncmp (p, "TITLE ", 6)) {
if (str[0] > ' ' && !albumtitle[0]) {
- pl_get_qvalue_from_cue (p + 6, sizeof (albumtitle), albumtitle);
+ pl_get_qvalue_from_cue (p + 6, sizeof (albumtitle), albumtitle, charset);
trace ("cue: got albumtitle: %s\n", albumtitle);
}
else {
- pl_get_qvalue_from_cue (p + 6, sizeof (title), title);
+ pl_get_qvalue_from_cue (p + 6, sizeof (title), title, charset);
trace ("cue: got title: %s\n", title);
}
}
else if (!strncmp (p, "REM GENRE ", 10)) {
- pl_get_qvalue_from_cue (p + 10, sizeof (genre), genre);
+ pl_get_qvalue_from_cue (p + 10, sizeof (genre), genre, charset);
}
else if (!strncmp (p, "REM DATE ", 9)) {
pl_get_value_from_cue (p + 9, sizeof (date), date);
@@@ -1113,10 -1141,10 +1141,10 @@@
trace ("cue: adding track: %s %s %s\n", uri, title, track);
if (title[0]) {
// add previous track
- playItem_t *it = plt_process_cue_track (playlist, uri, &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, dec, filetype, samplerate);
+ playItem_t *it = plt_process_cue_track (playlist, uri, origin->startsample, &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, dec, filetype, samplerate);
trace ("cue: added %p\n", it);
if (it) {
- if (it->startsample >= numsamples || it->endsample >= numsamples) {
+ if ((it->startsample-origin->startsample) >= numsamples || (it->endsample-origin->startsample) >= numsamples) {
trace ("cue: the track is shorter than cue timeline\n");
goto error;
}
@@@ -1162,11 -1190,11 +1190,11 @@@
}
if (title[0]) {
// handle last track
- playItem_t *it = plt_process_cue_track (playlist, uri, &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, dec, filetype, samplerate);
+ playItem_t *it = plt_process_cue_track (playlist, uri, origin->startsample, &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, dec, filetype, samplerate);
if (it) {
- trace ("last track endsample: %d\n", numsamples-1);
- it->endsample = numsamples-1;
- if (it->endsample >= numsamples || it->startsample >= numsamples) {
+ trace ("last track endsample: %d\n", origin->startsample+numsamples-1);
+ it->endsample = origin->startsample + numsamples - 1;
+ if ((it->endsample-origin->startsample) >= numsamples || (it->startsample-origin->startsample) >= numsamples) {
goto error;
}
plt_set_item_duration (playlist, it, (float)(it->endsample - it->startsample + 1) / samplerate);
@@@ -1222,16 -1250,27 +1250,27 @@@ plt_insert_cue (playlist_t *plt, playIt
strcpy (cuename+len, ".cue");
DB_FILE *fp = vfs_fopen (cuename);
if (!fp) {
+ strcpy (cuename+len, ".CUE");
+ fp = vfs_fopen (cuename);
+ }
+ if (!fp) {
char *ptr = cuename + len-1;
while (ptr >= cuename && *ptr != '.') {
ptr--;
}
+ if (ptr < cuename) {
+ return NULL;
+ }
strcpy (ptr+1, "cue");
fp = vfs_fopen (cuename);
if (!fp) {
- return NULL;
+ strcpy (ptr+1, "CUE");
+ fp = vfs_fopen (cuename);
}
}
+ if (!fp) {
+ return NULL;
+ }
size_t sz = vfs_fgetlength (fp);
if (sz == 0) {
vfs_fclose (fp);
@@@ -1272,7 -1311,6 +1311,6 @@@ plt_insert_file_int (int visibility, pl
DB_vfs_t **vfsplugs = plug_get_vfs_list ();
for (int i = 0; vfsplugs[i]; i++) {
if (vfsplugs[i]->is_container) {
- trace ("%s cont test\n", fname);
if (vfsplugs[i]->is_container (fname)) {
trace ("inserting %s via vfs %s\n", fname, vfsplugs[i]->plugin.id);
playItem_t *it = plt_insert_dir_int (visibility, playlist, vfsplugs[i], after, fname, pabort, cb, user_data);
@@@ -1352,6 -1390,11 +1390,11 @@@
}
}
else {
+ char *escaped = uri_unescape (fname, strlen (fname));
+ if (escaped) {
+ fname = strdupa (escaped);
+ free (escaped);
+ }
fname += 7;
}
@@@ -1477,11 -1520,25 +1520,25 @@@ plt_insert_dir_int (int visibility, pla
}
}
else {
- inserted = plt_insert_file_int (visibility, playlist, after, namelist[i]->d_name, pabort, cb, user_data);
- if (!inserted) {
- // special case for loading playlists in zip files
- inserted = plt_load_int (visibility, playlist, after, namelist[i]->d_name, pabort, cb, user_data);
+ char fullname[PATH_MAX];
+ const char *sch = NULL;
+ if (vfs->plugin.api_vminor >= 6 && vfs->get_scheme_for_name) {
+ sch = vfs->get_scheme_for_name (dirname);
}
+ if (sch && strncmp (sch, namelist[i]->d_name, strlen (sch))) {
+ snprintf (fullname, sizeof (fullname), "%s%s:%s", sch, dirname, namelist[i]->d_name);
+ }
+ else {
+ strcpy (fullname, namelist[i]->d_name);
+ }
+ inserted = plt_insert_file_int (visibility, playlist, after, fullname, pabort, cb, user_data);
+ // NOTE: adding archive to playlist is the same as adding a
+ // folder, so we don't load any playlists.
+ // the code below is kept for reference
+ // if (!inserted) {
+ // // special case for loading playlists in zip files
+ // inserted = plt_load_int (visibility, playlist, after, fullname, pabort, cb, user_data);
+ // }
}
if (inserted) {
after = inserted;
@@@ -1908,6 -1965,7 +1965,7 @@@ pl_crop_selected (void)
int
plt_save (playlist_t *plt, playItem_t *first, playItem_t *last, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
LOCK;
+ plt->last_save_modification_idx = plt->last_save_modification_idx;
const char *ext = strrchr (fname, '.');
if (ext) {
DB_playlist_t **plug = deadbeef->plug_get_playlist_list ();
@@@ -2166,6 -2224,7 +2224,7 @@@ pl_save_all (void)
int curr = plt_get_curr_idx ();
int err = 0;
+ plt_gen_conf ();
plt_loading = 1;
for (i = 0; i < cnt; i++, p = p->next) {
if (snprintf (path, sizeof (path), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path)) {
@@@ -2173,6 -2232,9 +2232,9 @@@
err = -1;
break;
}
+ if (p->last_save_modification_idx == p->modification_idx) {
+ continue;
+ }
err = plt_save (p, NULL, NULL, path, NULL, NULL, NULL);
if (err < 0) {
break;
@@@ -2457,6 -2519,9 +2519,9 @@@ plt_load_int (int visibility, playlist_
fclose (fp);
}
trace ("plt_load: success\n");
+ if (last_added) {
+ pl_item_unref (last_added);
+ }
return last_added;
load_fail:
plt_clear (plt);
@@@ -2464,6 -2529,9 +2529,9 @@@
if (fp) {
fclose (fp);
}
+ if (last_added) {
+ pl_item_unref (last_added);
+ }
return last_added;
}
@@@ -2492,9 -2560,6 +2560,6 @@@ pl_load_all (void)
playlist_t *plt = plt_get_for_idx (0);
playItem_t *it = plt_load (plt, NULL, defpl, NULL, NULL, NULL);
- if (it) {
- pl_item_unref (it);
- }
plt_unref (plt);
return 0;
}
@@@ -2520,9 -2585,12 +2585,12 @@@
playlist_t *plt = plt_get_curr ();
playItem_t *trk = plt_load (plt, NULL, path, NULL, NULL, NULL);
- if (trk) {
- pl_item_unref (trk);
- }
+ char conf[100];
+ snprintf (conf, sizeof (conf), "playlist.cursor.%d", i);
+ plt->current_row[PL_MAIN] = deadbeef->conf_get_int (conf, -1);
+ snprintf (conf, sizeof (conf), "playlist.scroll.%d", i);
+ plt->scroll = deadbeef->conf_get_int (conf, 0);
+ plt->last_save_modification_idx = plt->modification_idx = 0;
plt_unref (plt);
if (!it) {
@@@ -2878,9 -2946,30 +2946,30 @@@ pl_format_title_int (const char *escape
}
else if (*fmt == 'a') {
meta = pl_find_meta_raw (it, "artist");
- if (!meta) {
+ #ifndef DISABLE_CUSTOM_TITLE
+ const char *custom = pl_find_meta_raw (it, ":CUSTOM_TITLE");
+ #endif
+ if (!meta
+ #ifndef DISABLE_CUSTOM_TITLE
+ && !custom
+ #endif
+ ) {
meta = "Unknown artist";
}
+
+ #ifndef DISABLE_CUSTOM_TITLE
+ if (custom) {
+ if (!meta) {
+ meta = custom;
+ }
+ else {
+ int l = strlen (custom) + strlen (meta) + 4;
+ char *out = alloca (l);
+ snprintf (out, l, "[%s] %s", custom, meta);
+ meta = out;
+ }
+ }
+ #endif
}
else if (*fmt == 't') {
meta = pl_find_meta_raw (it, "title");
@@@ -2928,6 -3017,21 +3017,21 @@@
}
}
}
+
+ #ifndef DISABLE_CUSTOM_TITLE
+ const char *custom = pl_find_meta_raw (it, ":CUSTOM_TITLE");
+ if (custom) {
+ if (!meta) {
+ meta = custom;
+ }
+ else {
+ int l = strlen (custom) + strlen (meta) + 4;
+ char *out = alloca (l);
+ snprintf (out, l, "[%s] %s", custom, meta);
+ meta = out;
+ }
+ }
+ #endif
}
else if (*fmt == 'C') {
meta = pl_find_meta_raw (it, "composer");
@@@ -3690,7 -3794,7 +3794,7 @@@ plt_search_process (playlist_t *playlis
break;
}
}
- else if (utfcasestr_fast (value, lc)) {
+ else if (u8_valid(value, strlen(value), NULL) && u8_valid(lc, strlen(lc), NULL) && utfcasestr_fast (value, lc)) {
//fprintf (stderr, "%s -> %s match (%s.%s)\n", text, value, pl_find_meta_raw (it, ":URI"), m->key);
// add to list
it->next[PL_SEARCH] = NULL;
@@@ -3846,7 -3950,7 +3950,7 @@@ pl_items_copy_junk (playItem_t *from, p
DB_metaInfo_t *meta = from->meta;
while (meta) {
playItem_t *i;
- for (i = first; ; i = i->next[PL_MAIN]) {
+ for (i = first; i; i = i->next[PL_MAIN]) {
i->_flags = from->_flags;
pl_add_meta (i, meta->key, meta->value);
if (i == last) {
@@@ -4103,6 -4207,7 +4207,7 @@@ plt_add_files_begin (playlist_t *plt, i
for (ddb_fileadd_beginend_listener_t *l = file_add_beginend_listeners; l; l = l->next) {
l->callback_begin (&d, l->user_data);
}
+ background_job_increment ();
return 0;
}
@@@ -4123,6 -4228,7 +4228,7 @@@ plt_add_files_end (playlist_t *plt, in
for (ddb_fileadd_beginend_listener_t *l = file_add_beginend_listeners; l; l = l->next) {
l->callback_end (&d, l->user_data);
}
+ background_job_decrement ();
}
void
@@@ -4133,3 -4239,14 +4239,24 @@@ plt_deselect_all (playlist_t *playlist
}
UNLOCK;
}
+
+ void
++<<<<<<< HEAD
++plt_deselect_all (playlist_t *playlist) {
++ LOCK;
++ for (playItem_t *it = playlist->head[PL_MAIN]; it; it = it->next[PL_MAIN]) {
++ it->selected = 0;
++ }
++ UNLOCK;
++}
++=======
+ plt_set_scroll (playlist_t *plt, int scroll) {
+ plt->scroll = scroll;
+ }
+
+ int
+ plt_get_scroll (playlist_t *plt) {
+ return plt->scroll;
+ }
+
++>>>>>>> upstream/0.6.2
diff --combined playlist.h
index b8bdeb4,44149ab..039edd5
--- a/playlist.h
+++ b/playlist.h
@@@ -62,9 -62,11 +62,11 @@@ typedef struct playlist_s
int count[2];
float totaltime;
int modification_idx;
+ int last_save_modification_idx;
playItem_t *head[PL_MAX_ITERATORS]; // head of linked list
playItem_t *tail[PL_MAX_ITERATORS]; // tail of linked list
int current_row[PL_MAX_ITERATORS]; // current row (cursor)
+ int scroll;
struct DB_metaInfo_s *meta; // linked list storing metainfo
int refc;
int files_add_visibility;
@@@ -524,4 -526,10 +526,13 @@@ plt_add_files_end (playlist_t *plt, in
void
plt_deselect_all (playlist_t *plt);
++<<<<<<< HEAD
++=======
+ void
+ plt_set_scroll (playlist_t *plt, int scroll);
+
+ int
+ plt_get_scroll (playlist_t *plt);
+
++>>>>>>> upstream/0.6.2
#endif // __PLAYLIST_H
diff --combined plugins.c
index 0d9872e,bf8192c..9ef314d
--- a/plugins.c
+++ b/plugins.c
@@@ -365,6 -365,9 +365,12 @@@ static DB_functions_t deadbeef_api =
.plt_add_files_begin = (int (*) (ddb_playlist_t *plt, int visibility))plt_add_files_begin,
.plt_add_files_end = (void (*) (ddb_playlist_t *plt, int visibility))plt_add_files_end,
.plt_deselect_all = (void (*) (ddb_playlist_t *plt))plt_deselect_all,
++<<<<<<< HEAD
++=======
+ // ******* new 1.6 APIs ********
+ .plt_set_scroll = (void (*) (ddb_playlist_t *plt, int scroll))plt_set_scroll,
+ .plt_get_scroll = (int (*) (ddb_playlist_t *plt))plt_get_scroll,
++>>>>>>> upstream/0.6.2
};
DB_functions_t *deadbeef = &deadbeef_api;
@@@ -504,9 -507,11 +510,11 @@@ plug_init_plugin (DB_plugin_t* (*loadfu
// check if same plugin with the same or bigger version is loaded already
plugin_t *prev = NULL;
for (plugin_t *p = plugins; p; prev = p, p = p->next) {
- if (p->plugin->id && plugin_api->id && !strcmp (p->plugin->id, plugin_api->id)) {
+ int same_id = p->plugin->id && plugin_api->id && !strcmp (p->plugin->id, plugin_api->id);
+ int same_name = (!p->plugin->id || !plugin_api->id) && p->plugin->name && plugin_api->name && !strcmp (p->plugin->name, plugin_api->name);
+ if (same_id || same_name) {
if (plugin_api->version_major > p->plugin->version_major || (plugin_api->version_major == p->plugin->version_major && plugin_api->version_minor > p->plugin->version_minor)) {
- trace ("found newer version of plugin \"%s\", replacing\n", plugin_api->id);
+ trace ("found newer version of plugin \"%s\" (%s), replacing\n", plugin_api->id, plugin_api->name);
// unload older plugin before replacing
dlclose (p->handle);
if (prev) {
@@@ -521,7 -526,7 +529,7 @@@
free (p);
}
else {
- trace ("found copy of plugin \"%s\", but newer version is already loaded\n", plugin_api->id)
+ trace ("found copy of plugin \"%s\" (%s), but newer version is already loaded\n", plugin_api->id, plugin_api->name)
return -1;
}
}
@@@ -693,12 -698,17 +701,17 @@@ load_gui_plugin (const char **plugdirs
return -1;
}
- int
- load_plugin_dir (const char *plugdir) {
+ static int
+ load_plugin_dir (const char *plugdir, int gui_scan) {
int n = 0;
char conf_blacklist_plugins[1000];
conf_get_str ("blacklist_plugins", "", conf_blacklist_plugins, sizeof (conf_blacklist_plugins));
- trace ("loading plugins from %s\n", plugdir);
+ if (gui_scan) {
+ trace ("searching for GUI plugins in %s\n", plugdir);
+ }
+ else {
+ trace ("loading plugins from %s\n", plugdir);
+ }
struct dirent **namelist = NULL;
n = scandir (plugdir, &namelist, NULL, dirent_alphasort);
if (n < 0)
@@@ -759,35 -769,39 +772,39 @@@
// add gui plugin names
if (!strncmp (d_name, "ddb_gui_", 8)) {
- trace ("found gui plugin %s\n", d_name);
- if (g_num_gui_names >= MAX_GUI_PLUGINS) {
- fprintf (stderr, "too many gui plugins\n");
- break; // no more gui plugins allowed
- }
- char *nm = d_name + 8;
- char *e = strrchr (nm, '.');
- if (!e) {
- break;
- }
- if (strcmp (e, ".so")) {
- break;
- }
- *e = 0;
- // ignore fallbacks
- e = strrchr (nm, '.');
- if (e && !strcasecmp (e, ".fallback")) {
- break;
+ if (gui_scan) {
+ trace ("found gui plugin %s\n", d_name);
+ if (g_num_gui_names >= MAX_GUI_PLUGINS) {
+ fprintf (stderr, "too many gui plugins\n");
+ break; // no more gui plugins allowed
+ }
+ char *nm = d_name + 8;
+ char *e = strrchr (nm, '.');
+ if (!e) {
+ break;
+ }
+ if (strcmp (e, ".so")) {
+ break;
+ }
+ *e = 0;
+ // ignore fallbacks
+ e = strrchr (nm, '.');
+ if (e && !strcasecmp (e, ".fallback")) {
+ break;
+ }
+ // add to list
+ // FIXME check for gui plugins dupes
+ g_gui_names[g_num_gui_names++] = strdup (nm);
+ g_gui_names[g_num_gui_names] = NULL;
+ trace ("added %s gui plugin\n", nm);
}
- // add to list
- // FIXME check for gui plugins dupes
- g_gui_names[g_num_gui_names++] = strdup (nm);
- g_gui_names[g_num_gui_names] = NULL;
- trace ("added %s gui plugin\n", nm);
break;
}
- if (0 != load_plugin (plugdir, d_name, l)) {
- trace ("plugin not found or failed to load\n");
+ if (!gui_scan) {
+ if (0 != load_plugin (plugdir, d_name, l)) {
+ trace ("plugin not found or failed to load\n");
+ }
}
break;
}
@@@ -811,6 -825,7 +828,7 @@@ plug_load_all (void)
#ifndef ANDROID
char *xdg_local_home = getenv ("XDG_LOCAL_HOME");
char xdg_plugin_dir[1024];
+ char xdg_plugin_dir_explicit_arch[1024];
if (xdg_local_home) {
strncpy (xdg_plugin_dir, xdg_local_home, sizeof (xdg_plugin_dir));
@@@ -823,16 -838,24 +841,24 @@@
xdg_plugin_dir[0] = 0;
}
else {
+ // multilib support:
+ // 1. load from lib$ARCH if present
+ // 2. load from lib if present
int written = snprintf (xdg_plugin_dir, sizeof (xdg_plugin_dir), "%s/.local/lib/deadbeef", homedir);
if (written > sizeof (xdg_plugin_dir)) {
trace ("warning: XDG_LOCAL_HOME value is too long: %s. Ignoring.", xdg_local_home);
xdg_plugin_dir[0] = 0;
}
+ written = snprintf (xdg_plugin_dir_explicit_arch, sizeof (xdg_plugin_dir_explicit_arch), "%s/.local/lib%d/deadbeef", homedir, (int)(sizeof (long) * 8));
+ if (written > sizeof (xdg_plugin_dir_explicit_arch)) {
+ trace ("warning: XDG_LOCAL_HOME value is too long: %s. Ignoring.", xdg_local_home);
+ xdg_plugin_dir_explicit_arch[0] = 0;
+ }
}
}
// load from HOME 1st, than replace from installdir if needed
- const char *plugins_dirs[] = { xdg_plugin_dir, dirname, NULL };
+ const char *plugins_dirs[] = { xdg_plugin_dir_explicit_arch, xdg_plugin_dir, dirname, NULL };
// If xdg_plugin_dir and dirname is the same, we should avoid each plugin
// to be load twice.
@@@ -846,13 -869,26 +872,26 @@@
#endif
int k = 0;
+ #ifndef ANDROID
+ // load gui plugin before others
+ while (plugins_dirs[k]) {
+ const char *plugdir = plugins_dirs[k++];
+ if (!(*plugdir)) {
+ continue;
+ }
+ load_plugin_dir (plugdir, 1);
+ }
+ printf ("load gui plugin\n");
+ load_gui_plugin (plugins_dirs);
+ #endif
+ k = 0;
while (plugins_dirs[k]) {
const char *plugdir = plugins_dirs[k++];
if (!(*plugdir)) {
continue;
}
- load_plugin_dir (plugdir);
+ load_plugin_dir (plugdir, 0);
}
#ifdef ANDROID
@@@ -882,10 -918,6 +921,6 @@@
}
#endif
-
- // load gui plugin
- load_gui_plugin (plugins_dirs);
-
// load all compiled-in modules
#define PLUG(n) extern DB_plugin_t * n##_load (DB_functions_t *api);
#include "moduleconf.h"
diff --combined plugins/aac/Makefile.in
index ac0b45d,6b16032..a86ccbe
--- a/plugins/aac/Makefile.in
+++ b/plugins/aac/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/aac
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -115,23 -143,48 +167,48 @@@ am__DEPENDENCIES_1
am__aac_la_SOURCES_DIST = aac.c aac_parser.c aac_parser.h
@HAVE_AAC_TRUE at am_aac_la_OBJECTS = aac.lo aac_parser.lo
aac_la_OBJECTS = $(am_aac_la_OBJECTS)
- aac_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(aac_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ aac_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(aac_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_AAC_TRUE at am_aac_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(aac_la_SOURCES)
DIST_SOURCES = $(am__aac_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -139,6 -192,23 +216,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -165,6 -235,7 +262,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -185,10 -256,12 +283,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -211,6 -284,7 +311,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -264,6 -338,7 +365,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -282,6 -357,8 +384,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -307,13 -384,17 +411,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -322,7 -403,9 +430,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -384,9 -467,9 +494,9 @@@ top_srcdir = @top_srcdir
@HAVE_AAC_TRUE at aacdir = $(libdir)/$(PACKAGE)
@HAVE_AAC_TRUE at pkglib_LTLIBRARIES = aac.la
@HAVE_AAC_TRUE at aac_la_SOURCES = aac.c aac_parser.c aac_parser.h
- @HAVE_AAC_TRUE at aac_la_LDFLAGS = -module
+ @HAVE_AAC_TRUE at aac_la_LDFLAGS = -module -avoid-version
@HAVE_AAC_TRUE at aac_la_LIBADD = $(LDADD) $(FAAD2_LIBS) ../libmp4ff/libmp4ff.a
- @HAVE_AAC_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING -I at top_srcdir@/plugins/libmp4ff
+ @HAVE_AAC_TRUE at AM_CFLAGS = -I at top_srcdir@/plugins/libmp4ff $(CFLAGS) $(FAAD2_CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING
all: all-am
.SUFFIXES:
@@@ -421,6 -504,7 +531,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -447,14 -531,17 +558,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
aac.la: $(aac_la_OBJECTS) $(aac_la_DEPENDENCIES) $(EXTRA_aac_la_DEPENDENCIES)
- $(aac_la_LINK) $(am_aac_la_rpath) $(aac_la_OBJECTS) $(aac_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(aac_la_LINK) $(am_aac_la_rpath) $(aac_la_OBJECTS) $(aac_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -466,25 -553,25 +580,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aac_parser.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -492,26 -579,15 +606,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -523,15 -599,11 +626,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -540,6 -612,21 +639,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -684,19 -771,20 +798,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/adplug/Makefile.in
index 83894b8,8eaefe3..f2c558d
--- a/plugins/adplug/Makefile.in
+++ b/plugins/adplug/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/adplug
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -158,32 -186,66 +210,66 @@@ am__adplug_la_SOURCES_DIST = plugin.c a
@HAVE_ADPLUG_TRUE@ rol.lo s3m.lo sa2.lo sng.lo surroundopl.lo \
@HAVE_ADPLUG_TRUE@ temuopl.lo u6m.lo xad.lo xsm.lo
adplug_la_OBJECTS = $(am_adplug_la_OBJECTS)
- adplug_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ adplug_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(adplug_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_ADPLUG_TRUE at am_adplug_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+ AM_V_CXX = $(am__v_CXX_ at AM_V@)
+ am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+ am__v_CXX_0 = @echo " CXX " $@;
+ am__v_CXX_1 =
CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+ am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+ am__v_CXXLD_0 = @echo " CXXLD " $@;
+ am__v_CXXLD_1 =
SOURCES = $(adplug_la_SOURCES)
DIST_SOURCES = $(am__adplug_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -191,6 -253,23 +277,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -217,6 -296,7 +323,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -237,10 -317,12 +344,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -263,6 -345,7 +372,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -316,6 -399,7 +426,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -334,6 -418,8 +445,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -359,13 -445,17 +472,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -374,7 -464,9 +491,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -436,7 -528,7 +555,7 @@@ top_srcdir = @top_srcdir
@HAVE_ADPLUG_TRUE at adlibdir = $(libdir)/$(PACKAGE)
@HAVE_ADPLUG_TRUE at pkglib_LTLIBRARIES = adplug.la
@HAVE_ADPLUG_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fPIC
- @HAVE_ADPLUG_TRUE at adplug_la_LDFLAGS = -module $(NOCPPLIB) -lm
+ @HAVE_ADPLUG_TRUE at adplug_la_LDFLAGS = -module -avoid-version $(NOCPPLIB) -lm
@HAVE_ADPLUG_TRUE at AM_CPPFLAGS = $(CXXFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fno-exceptions -fno-rtti -fno-unwind-tables
@HAVE_ADPLUG_TRUE at adplug_la_SOURCES = plugin.c\
@HAVE_ADPLUG_TRUE@ adplug-db.cpp\
@@@ -595,6 -687,7 +714,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -621,14 -714,17 +741,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
adplug.la: $(adplug_la_OBJECTS) $(adplug_la_DEPENDENCIES) $(EXTRA_adplug_la_DEPENDENCIES)
- $(adplug_la_LINK) $(am_adplug_la_rpath) $(adplug_la_OBJECTS) $(adplug_la_LIBADD) $(LIBS)
+ $(AM_V_CXXLD)$(adplug_la_LINK) $(am_adplug_la_rpath) $(adplug_la_OBJECTS) $(adplug_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -698,452 -794,452 +821,452 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xsm.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
adlibemu.lo: adplug/adlibemu.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT adlibemu.lo -MD -MP -MF $(DEPDIR)/adlibemu.Tpo -c -o adlibemu.lo `test -f 'adplug/adlibemu.c' || echo '$(srcdir)/'`adplug/adlibemu.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/adlibemu.Tpo $(DEPDIR)/adlibemu.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='adplug/adlibemu.c' object='adlibemu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT adlibemu.lo -MD -MP -MF $(DEPDIR)/adlibemu.Tpo -c -o adlibemu.lo `test -f 'adplug/adlibemu.c' || echo '$(srcdir)/'`adplug/adlibemu.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/adlibemu.Tpo $(DEPDIR)/adlibemu.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='adplug/adlibemu.c' object='adlibemu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adlibemu.lo `test -f 'adplug/adlibemu.c' || echo '$(srcdir)/'`adplug/adlibemu.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adlibemu.lo `test -f 'adplug/adlibemu.c' || echo '$(srcdir)/'`adplug/adlibemu.c
debug.lo: adplug/debug.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT debug.lo -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.lo `test -f 'adplug/debug.c' || echo '$(srcdir)/'`adplug/debug.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='adplug/debug.c' object='debug.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT debug.lo -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.lo `test -f 'adplug/debug.c' || echo '$(srcdir)/'`adplug/debug.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='adplug/debug.c' object='debug.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o debug.lo `test -f 'adplug/debug.c' || echo '$(srcdir)/'`adplug/debug.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o debug.lo `test -f 'adplug/debug.c' || echo '$(srcdir)/'`adplug/debug.c
fmopl.lo: adplug/fmopl.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fmopl.lo -MD -MP -MF $(DEPDIR)/fmopl.Tpo -c -o fmopl.lo `test -f 'adplug/fmopl.c' || echo '$(srcdir)/'`adplug/fmopl.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/fmopl.Tpo $(DEPDIR)/fmopl.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='adplug/fmopl.c' object='fmopl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fmopl.lo -MD -MP -MF $(DEPDIR)/fmopl.Tpo -c -o fmopl.lo `test -f 'adplug/fmopl.c' || echo '$(srcdir)/'`adplug/fmopl.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fmopl.Tpo $(DEPDIR)/fmopl.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='adplug/fmopl.c' object='fmopl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fmopl.lo `test -f 'adplug/fmopl.c' || echo '$(srcdir)/'`adplug/fmopl.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fmopl.lo `test -f 'adplug/fmopl.c' || echo '$(srcdir)/'`adplug/fmopl.c
.cpp.o:
- @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cpp.obj:
- @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cpp.lo:
- @am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
binfile.lo: libbinio/binfile.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binfile.lo -MD -MP -MF $(DEPDIR)/binfile.Tpo -c -o binfile.lo `test -f 'libbinio/binfile.cpp' || echo '$(srcdir)/'`libbinio/binfile.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/binfile.Tpo $(DEPDIR)/binfile.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='libbinio/binfile.cpp' object='binfile.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binfile.lo -MD -MP -MF $(DEPDIR)/binfile.Tpo -c -o binfile.lo `test -f 'libbinio/binfile.cpp' || echo '$(srcdir)/'`libbinio/binfile.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/binfile.Tpo $(DEPDIR)/binfile.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libbinio/binfile.cpp' object='binfile.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binfile.lo `test -f 'libbinio/binfile.cpp' || echo '$(srcdir)/'`libbinio/binfile.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binfile.lo `test -f 'libbinio/binfile.cpp' || echo '$(srcdir)/'`libbinio/binfile.cpp
binio.lo: libbinio/binio.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binio.lo -MD -MP -MF $(DEPDIR)/binio.Tpo -c -o binio.lo `test -f 'libbinio/binio.cpp' || echo '$(srcdir)/'`libbinio/binio.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/binio.Tpo $(DEPDIR)/binio.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='libbinio/binio.cpp' object='binio.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binio.lo -MD -MP -MF $(DEPDIR)/binio.Tpo -c -o binio.lo `test -f 'libbinio/binio.cpp' || echo '$(srcdir)/'`libbinio/binio.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/binio.Tpo $(DEPDIR)/binio.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libbinio/binio.cpp' object='binio.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binio.lo `test -f 'libbinio/binio.cpp' || echo '$(srcdir)/'`libbinio/binio.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binio.lo `test -f 'libbinio/binio.cpp' || echo '$(srcdir)/'`libbinio/binio.cpp
binstr.lo: libbinio/binstr.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binstr.lo -MD -MP -MF $(DEPDIR)/binstr.Tpo -c -o binstr.lo `test -f 'libbinio/binstr.cpp' || echo '$(srcdir)/'`libbinio/binstr.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/binstr.Tpo $(DEPDIR)/binstr.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='libbinio/binstr.cpp' object='binstr.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binstr.lo -MD -MP -MF $(DEPDIR)/binstr.Tpo -c -o binstr.lo `test -f 'libbinio/binstr.cpp' || echo '$(srcdir)/'`libbinio/binstr.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/binstr.Tpo $(DEPDIR)/binstr.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libbinio/binstr.cpp' object='binstr.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binstr.lo `test -f 'libbinio/binstr.cpp' || echo '$(srcdir)/'`libbinio/binstr.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binstr.lo `test -f 'libbinio/binstr.cpp' || echo '$(srcdir)/'`libbinio/binstr.cpp
binwrap.lo: libbinio/binwrap.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binwrap.lo -MD -MP -MF $(DEPDIR)/binwrap.Tpo -c -o binwrap.lo `test -f 'libbinio/binwrap.cpp' || echo '$(srcdir)/'`libbinio/binwrap.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/binwrap.Tpo $(DEPDIR)/binwrap.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='libbinio/binwrap.cpp' object='binwrap.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binwrap.lo -MD -MP -MF $(DEPDIR)/binwrap.Tpo -c -o binwrap.lo `test -f 'libbinio/binwrap.cpp' || echo '$(srcdir)/'`libbinio/binwrap.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/binwrap.Tpo $(DEPDIR)/binwrap.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libbinio/binwrap.cpp' object='binwrap.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binwrap.lo `test -f 'libbinio/binwrap.cpp' || echo '$(srcdir)/'`libbinio/binwrap.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binwrap.lo `test -f 'libbinio/binwrap.cpp' || echo '$(srcdir)/'`libbinio/binwrap.cpp
a2m.lo: adplug/a2m.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT a2m.lo -MD -MP -MF $(DEPDIR)/a2m.Tpo -c -o a2m.lo `test -f 'adplug/a2m.cpp' || echo '$(srcdir)/'`adplug/a2m.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/a2m.Tpo $(DEPDIR)/a2m.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/a2m.cpp' object='a2m.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT a2m.lo -MD -MP -MF $(DEPDIR)/a2m.Tpo -c -o a2m.lo `test -f 'adplug/a2m.cpp' || echo '$(srcdir)/'`adplug/a2m.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/a2m.Tpo $(DEPDIR)/a2m.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/a2m.cpp' object='a2m.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o a2m.lo `test -f 'adplug/a2m.cpp' || echo '$(srcdir)/'`adplug/a2m.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o a2m.lo `test -f 'adplug/a2m.cpp' || echo '$(srcdir)/'`adplug/a2m.cpp
adl.lo: adplug/adl.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adl.lo -MD -MP -MF $(DEPDIR)/adl.Tpo -c -o adl.lo `test -f 'adplug/adl.cpp' || echo '$(srcdir)/'`adplug/adl.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/adl.Tpo $(DEPDIR)/adl.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/adl.cpp' object='adl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adl.lo -MD -MP -MF $(DEPDIR)/adl.Tpo -c -o adl.lo `test -f 'adplug/adl.cpp' || echo '$(srcdir)/'`adplug/adl.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/adl.Tpo $(DEPDIR)/adl.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/adl.cpp' object='adl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adl.lo `test -f 'adplug/adl.cpp' || echo '$(srcdir)/'`adplug/adl.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adl.lo `test -f 'adplug/adl.cpp' || echo '$(srcdir)/'`adplug/adl.cpp
adplug.lo: adplug/adplug.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adplug.lo -MD -MP -MF $(DEPDIR)/adplug.Tpo -c -o adplug.lo `test -f 'adplug/adplug.cpp' || echo '$(srcdir)/'`adplug/adplug.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/adplug.Tpo $(DEPDIR)/adplug.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/adplug.cpp' object='adplug.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adplug.lo -MD -MP -MF $(DEPDIR)/adplug.Tpo -c -o adplug.lo `test -f 'adplug/adplug.cpp' || echo '$(srcdir)/'`adplug/adplug.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/adplug.Tpo $(DEPDIR)/adplug.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/adplug.cpp' object='adplug.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adplug.lo `test -f 'adplug/adplug.cpp' || echo '$(srcdir)/'`adplug/adplug.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adplug.lo `test -f 'adplug/adplug.cpp' || echo '$(srcdir)/'`adplug/adplug.cpp
adtrack.lo: adplug/adtrack.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adtrack.lo -MD -MP -MF $(DEPDIR)/adtrack.Tpo -c -o adtrack.lo `test -f 'adplug/adtrack.cpp' || echo '$(srcdir)/'`adplug/adtrack.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/adtrack.Tpo $(DEPDIR)/adtrack.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/adtrack.cpp' object='adtrack.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adtrack.lo -MD -MP -MF $(DEPDIR)/adtrack.Tpo -c -o adtrack.lo `test -f 'adplug/adtrack.cpp' || echo '$(srcdir)/'`adplug/adtrack.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/adtrack.Tpo $(DEPDIR)/adtrack.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/adtrack.cpp' object='adtrack.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adtrack.lo `test -f 'adplug/adtrack.cpp' || echo '$(srcdir)/'`adplug/adtrack.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adtrack.lo `test -f 'adplug/adtrack.cpp' || echo '$(srcdir)/'`adplug/adtrack.cpp
amd.lo: adplug/amd.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT amd.lo -MD -MP -MF $(DEPDIR)/amd.Tpo -c -o amd.lo `test -f 'adplug/amd.cpp' || echo '$(srcdir)/'`adplug/amd.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/amd.Tpo $(DEPDIR)/amd.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/amd.cpp' object='amd.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT amd.lo -MD -MP -MF $(DEPDIR)/amd.Tpo -c -o amd.lo `test -f 'adplug/amd.cpp' || echo '$(srcdir)/'`adplug/amd.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/amd.Tpo $(DEPDIR)/amd.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/amd.cpp' object='amd.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o amd.lo `test -f 'adplug/amd.cpp' || echo '$(srcdir)/'`adplug/amd.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o amd.lo `test -f 'adplug/amd.cpp' || echo '$(srcdir)/'`adplug/amd.cpp
analopl.lo: adplug/analopl.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT analopl.lo -MD -MP -MF $(DEPDIR)/analopl.Tpo -c -o analopl.lo `test -f 'adplug/analopl.cpp' || echo '$(srcdir)/'`adplug/analopl.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/analopl.Tpo $(DEPDIR)/analopl.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/analopl.cpp' object='analopl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT analopl.lo -MD -MP -MF $(DEPDIR)/analopl.Tpo -c -o analopl.lo `test -f 'adplug/analopl.cpp' || echo '$(srcdir)/'`adplug/analopl.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/analopl.Tpo $(DEPDIR)/analopl.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/analopl.cpp' object='analopl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o analopl.lo `test -f 'adplug/analopl.cpp' || echo '$(srcdir)/'`adplug/analopl.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o analopl.lo `test -f 'adplug/analopl.cpp' || echo '$(srcdir)/'`adplug/analopl.cpp
bam.lo: adplug/bam.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bam.lo -MD -MP -MF $(DEPDIR)/bam.Tpo -c -o bam.lo `test -f 'adplug/bam.cpp' || echo '$(srcdir)/'`adplug/bam.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/bam.Tpo $(DEPDIR)/bam.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/bam.cpp' object='bam.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bam.lo -MD -MP -MF $(DEPDIR)/bam.Tpo -c -o bam.lo `test -f 'adplug/bam.cpp' || echo '$(srcdir)/'`adplug/bam.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/bam.Tpo $(DEPDIR)/bam.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/bam.cpp' object='bam.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bam.lo `test -f 'adplug/bam.cpp' || echo '$(srcdir)/'`adplug/bam.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bam.lo `test -f 'adplug/bam.cpp' || echo '$(srcdir)/'`adplug/bam.cpp
bmf.lo: adplug/bmf.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bmf.lo -MD -MP -MF $(DEPDIR)/bmf.Tpo -c -o bmf.lo `test -f 'adplug/bmf.cpp' || echo '$(srcdir)/'`adplug/bmf.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/bmf.Tpo $(DEPDIR)/bmf.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/bmf.cpp' object='bmf.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bmf.lo -MD -MP -MF $(DEPDIR)/bmf.Tpo -c -o bmf.lo `test -f 'adplug/bmf.cpp' || echo '$(srcdir)/'`adplug/bmf.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/bmf.Tpo $(DEPDIR)/bmf.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/bmf.cpp' object='bmf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bmf.lo `test -f 'adplug/bmf.cpp' || echo '$(srcdir)/'`adplug/bmf.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bmf.lo `test -f 'adplug/bmf.cpp' || echo '$(srcdir)/'`adplug/bmf.cpp
cff.lo: adplug/cff.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cff.lo -MD -MP -MF $(DEPDIR)/cff.Tpo -c -o cff.lo `test -f 'adplug/cff.cpp' || echo '$(srcdir)/'`adplug/cff.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cff.Tpo $(DEPDIR)/cff.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/cff.cpp' object='cff.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cff.lo -MD -MP -MF $(DEPDIR)/cff.Tpo -c -o cff.lo `test -f 'adplug/cff.cpp' || echo '$(srcdir)/'`adplug/cff.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cff.Tpo $(DEPDIR)/cff.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/cff.cpp' object='cff.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cff.lo `test -f 'adplug/cff.cpp' || echo '$(srcdir)/'`adplug/cff.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cff.lo `test -f 'adplug/cff.cpp' || echo '$(srcdir)/'`adplug/cff.cpp
d00.lo: adplug/d00.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT d00.lo -MD -MP -MF $(DEPDIR)/d00.Tpo -c -o d00.lo `test -f 'adplug/d00.cpp' || echo '$(srcdir)/'`adplug/d00.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/d00.Tpo $(DEPDIR)/d00.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/d00.cpp' object='d00.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT d00.lo -MD -MP -MF $(DEPDIR)/d00.Tpo -c -o d00.lo `test -f 'adplug/d00.cpp' || echo '$(srcdir)/'`adplug/d00.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/d00.Tpo $(DEPDIR)/d00.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/d00.cpp' object='d00.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o d00.lo `test -f 'adplug/d00.cpp' || echo '$(srcdir)/'`adplug/d00.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o d00.lo `test -f 'adplug/d00.cpp' || echo '$(srcdir)/'`adplug/d00.cpp
dfm.lo: adplug/dfm.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dfm.lo -MD -MP -MF $(DEPDIR)/dfm.Tpo -c -o dfm.lo `test -f 'adplug/dfm.cpp' || echo '$(srcdir)/'`adplug/dfm.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/dfm.Tpo $(DEPDIR)/dfm.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/dfm.cpp' object='dfm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dfm.lo -MD -MP -MF $(DEPDIR)/dfm.Tpo -c -o dfm.lo `test -f 'adplug/dfm.cpp' || echo '$(srcdir)/'`adplug/dfm.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dfm.Tpo $(DEPDIR)/dfm.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/dfm.cpp' object='dfm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dfm.lo `test -f 'adplug/dfm.cpp' || echo '$(srcdir)/'`adplug/dfm.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dfm.lo `test -f 'adplug/dfm.cpp' || echo '$(srcdir)/'`adplug/dfm.cpp
diskopl.lo: adplug/diskopl.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT diskopl.lo -MD -MP -MF $(DEPDIR)/diskopl.Tpo -c -o diskopl.lo `test -f 'adplug/diskopl.cpp' || echo '$(srcdir)/'`adplug/diskopl.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/diskopl.Tpo $(DEPDIR)/diskopl.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/diskopl.cpp' object='diskopl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT diskopl.lo -MD -MP -MF $(DEPDIR)/diskopl.Tpo -c -o diskopl.lo `test -f 'adplug/diskopl.cpp' || echo '$(srcdir)/'`adplug/diskopl.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/diskopl.Tpo $(DEPDIR)/diskopl.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/diskopl.cpp' object='diskopl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o diskopl.lo `test -f 'adplug/diskopl.cpp' || echo '$(srcdir)/'`adplug/diskopl.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o diskopl.lo `test -f 'adplug/diskopl.cpp' || echo '$(srcdir)/'`adplug/diskopl.cpp
dmo.lo: adplug/dmo.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dmo.lo -MD -MP -MF $(DEPDIR)/dmo.Tpo -c -o dmo.lo `test -f 'adplug/dmo.cpp' || echo '$(srcdir)/'`adplug/dmo.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/dmo.Tpo $(DEPDIR)/dmo.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/dmo.cpp' object='dmo.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dmo.lo -MD -MP -MF $(DEPDIR)/dmo.Tpo -c -o dmo.lo `test -f 'adplug/dmo.cpp' || echo '$(srcdir)/'`adplug/dmo.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dmo.Tpo $(DEPDIR)/dmo.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/dmo.cpp' object='dmo.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dmo.lo `test -f 'adplug/dmo.cpp' || echo '$(srcdir)/'`adplug/dmo.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dmo.lo `test -f 'adplug/dmo.cpp' || echo '$(srcdir)/'`adplug/dmo.cpp
dro2.lo: adplug/dro2.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dro2.lo -MD -MP -MF $(DEPDIR)/dro2.Tpo -c -o dro2.lo `test -f 'adplug/dro2.cpp' || echo '$(srcdir)/'`adplug/dro2.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/dro2.Tpo $(DEPDIR)/dro2.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/dro2.cpp' object='dro2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dro2.lo -MD -MP -MF $(DEPDIR)/dro2.Tpo -c -o dro2.lo `test -f 'adplug/dro2.cpp' || echo '$(srcdir)/'`adplug/dro2.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dro2.Tpo $(DEPDIR)/dro2.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/dro2.cpp' object='dro2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dro2.lo `test -f 'adplug/dro2.cpp' || echo '$(srcdir)/'`adplug/dro2.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dro2.lo `test -f 'adplug/dro2.cpp' || echo '$(srcdir)/'`adplug/dro2.cpp
dro.lo: adplug/dro.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dro.lo -MD -MP -MF $(DEPDIR)/dro.Tpo -c -o dro.lo `test -f 'adplug/dro.cpp' || echo '$(srcdir)/'`adplug/dro.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/dro.Tpo $(DEPDIR)/dro.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/dro.cpp' object='dro.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dro.lo -MD -MP -MF $(DEPDIR)/dro.Tpo -c -o dro.lo `test -f 'adplug/dro.cpp' || echo '$(srcdir)/'`adplug/dro.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dro.Tpo $(DEPDIR)/dro.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/dro.cpp' object='dro.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dro.lo `test -f 'adplug/dro.cpp' || echo '$(srcdir)/'`adplug/dro.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dro.lo `test -f 'adplug/dro.cpp' || echo '$(srcdir)/'`adplug/dro.cpp
dtm.lo: adplug/dtm.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dtm.lo -MD -MP -MF $(DEPDIR)/dtm.Tpo -c -o dtm.lo `test -f 'adplug/dtm.cpp' || echo '$(srcdir)/'`adplug/dtm.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/dtm.Tpo $(DEPDIR)/dtm.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/dtm.cpp' object='dtm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dtm.lo -MD -MP -MF $(DEPDIR)/dtm.Tpo -c -o dtm.lo `test -f 'adplug/dtm.cpp' || echo '$(srcdir)/'`adplug/dtm.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dtm.Tpo $(DEPDIR)/dtm.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/dtm.cpp' object='dtm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dtm.lo `test -f 'adplug/dtm.cpp' || echo '$(srcdir)/'`adplug/dtm.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dtm.lo `test -f 'adplug/dtm.cpp' || echo '$(srcdir)/'`adplug/dtm.cpp
emuopl.lo: adplug/emuopl.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT emuopl.lo -MD -MP -MF $(DEPDIR)/emuopl.Tpo -c -o emuopl.lo `test -f 'adplug/emuopl.cpp' || echo '$(srcdir)/'`adplug/emuopl.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/emuopl.Tpo $(DEPDIR)/emuopl.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/emuopl.cpp' object='emuopl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT emuopl.lo -MD -MP -MF $(DEPDIR)/emuopl.Tpo -c -o emuopl.lo `test -f 'adplug/emuopl.cpp' || echo '$(srcdir)/'`adplug/emuopl.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/emuopl.Tpo $(DEPDIR)/emuopl.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/emuopl.cpp' object='emuopl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o emuopl.lo `test -f 'adplug/emuopl.cpp' || echo '$(srcdir)/'`adplug/emuopl.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o emuopl.lo `test -f 'adplug/emuopl.cpp' || echo '$(srcdir)/'`adplug/emuopl.cpp
flash.lo: adplug/flash.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT flash.lo -MD -MP -MF $(DEPDIR)/flash.Tpo -c -o flash.lo `test -f 'adplug/flash.cpp' || echo '$(srcdir)/'`adplug/flash.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/flash.Tpo $(DEPDIR)/flash.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/flash.cpp' object='flash.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT flash.lo -MD -MP -MF $(DEPDIR)/flash.Tpo -c -o flash.lo `test -f 'adplug/flash.cpp' || echo '$(srcdir)/'`adplug/flash.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/flash.Tpo $(DEPDIR)/flash.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/flash.cpp' object='flash.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o flash.lo `test -f 'adplug/flash.cpp' || echo '$(srcdir)/'`adplug/flash.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o flash.lo `test -f 'adplug/flash.cpp' || echo '$(srcdir)/'`adplug/flash.cpp
fmc.lo: adplug/fmc.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fmc.lo -MD -MP -MF $(DEPDIR)/fmc.Tpo -c -o fmc.lo `test -f 'adplug/fmc.cpp' || echo '$(srcdir)/'`adplug/fmc.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/fmc.Tpo $(DEPDIR)/fmc.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/fmc.cpp' object='fmc.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fmc.lo -MD -MP -MF $(DEPDIR)/fmc.Tpo -c -o fmc.lo `test -f 'adplug/fmc.cpp' || echo '$(srcdir)/'`adplug/fmc.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fmc.Tpo $(DEPDIR)/fmc.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/fmc.cpp' object='fmc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fmc.lo `test -f 'adplug/fmc.cpp' || echo '$(srcdir)/'`adplug/fmc.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fmc.lo `test -f 'adplug/fmc.cpp' || echo '$(srcdir)/'`adplug/fmc.cpp
fprovide.lo: adplug/fprovide.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fprovide.lo -MD -MP -MF $(DEPDIR)/fprovide.Tpo -c -o fprovide.lo `test -f 'adplug/fprovide.cpp' || echo '$(srcdir)/'`adplug/fprovide.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/fprovide.Tpo $(DEPDIR)/fprovide.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/fprovide.cpp' object='fprovide.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fprovide.lo -MD -MP -MF $(DEPDIR)/fprovide.Tpo -c -o fprovide.lo `test -f 'adplug/fprovide.cpp' || echo '$(srcdir)/'`adplug/fprovide.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fprovide.Tpo $(DEPDIR)/fprovide.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/fprovide.cpp' object='fprovide.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fprovide.lo `test -f 'adplug/fprovide.cpp' || echo '$(srcdir)/'`adplug/fprovide.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fprovide.lo `test -f 'adplug/fprovide.cpp' || echo '$(srcdir)/'`adplug/fprovide.cpp
hsc.lo: adplug/hsc.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hsc.lo -MD -MP -MF $(DEPDIR)/hsc.Tpo -c -o hsc.lo `test -f 'adplug/hsc.cpp' || echo '$(srcdir)/'`adplug/hsc.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hsc.Tpo $(DEPDIR)/hsc.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/hsc.cpp' object='hsc.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hsc.lo -MD -MP -MF $(DEPDIR)/hsc.Tpo -c -o hsc.lo `test -f 'adplug/hsc.cpp' || echo '$(srcdir)/'`adplug/hsc.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hsc.Tpo $(DEPDIR)/hsc.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/hsc.cpp' object='hsc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hsc.lo `test -f 'adplug/hsc.cpp' || echo '$(srcdir)/'`adplug/hsc.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hsc.lo `test -f 'adplug/hsc.cpp' || echo '$(srcdir)/'`adplug/hsc.cpp
hsp.lo: adplug/hsp.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hsp.lo -MD -MP -MF $(DEPDIR)/hsp.Tpo -c -o hsp.lo `test -f 'adplug/hsp.cpp' || echo '$(srcdir)/'`adplug/hsp.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hsp.Tpo $(DEPDIR)/hsp.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/hsp.cpp' object='hsp.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hsp.lo -MD -MP -MF $(DEPDIR)/hsp.Tpo -c -o hsp.lo `test -f 'adplug/hsp.cpp' || echo '$(srcdir)/'`adplug/hsp.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hsp.Tpo $(DEPDIR)/hsp.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/hsp.cpp' object='hsp.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hsp.lo `test -f 'adplug/hsp.cpp' || echo '$(srcdir)/'`adplug/hsp.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hsp.lo `test -f 'adplug/hsp.cpp' || echo '$(srcdir)/'`adplug/hsp.cpp
hybrid.lo: adplug/hybrid.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hybrid.lo -MD -MP -MF $(DEPDIR)/hybrid.Tpo -c -o hybrid.lo `test -f 'adplug/hybrid.cpp' || echo '$(srcdir)/'`adplug/hybrid.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hybrid.Tpo $(DEPDIR)/hybrid.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/hybrid.cpp' object='hybrid.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hybrid.lo -MD -MP -MF $(DEPDIR)/hybrid.Tpo -c -o hybrid.lo `test -f 'adplug/hybrid.cpp' || echo '$(srcdir)/'`adplug/hybrid.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hybrid.Tpo $(DEPDIR)/hybrid.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/hybrid.cpp' object='hybrid.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hybrid.lo `test -f 'adplug/hybrid.cpp' || echo '$(srcdir)/'`adplug/hybrid.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hybrid.lo `test -f 'adplug/hybrid.cpp' || echo '$(srcdir)/'`adplug/hybrid.cpp
hyp.lo: adplug/hyp.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hyp.lo -MD -MP -MF $(DEPDIR)/hyp.Tpo -c -o hyp.lo `test -f 'adplug/hyp.cpp' || echo '$(srcdir)/'`adplug/hyp.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hyp.Tpo $(DEPDIR)/hyp.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/hyp.cpp' object='hyp.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hyp.lo -MD -MP -MF $(DEPDIR)/hyp.Tpo -c -o hyp.lo `test -f 'adplug/hyp.cpp' || echo '$(srcdir)/'`adplug/hyp.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hyp.Tpo $(DEPDIR)/hyp.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/hyp.cpp' object='hyp.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hyp.lo `test -f 'adplug/hyp.cpp' || echo '$(srcdir)/'`adplug/hyp.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hyp.lo `test -f 'adplug/hyp.cpp' || echo '$(srcdir)/'`adplug/hyp.cpp
imf.lo: adplug/imf.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT imf.lo -MD -MP -MF $(DEPDIR)/imf.Tpo -c -o imf.lo `test -f 'adplug/imf.cpp' || echo '$(srcdir)/'`adplug/imf.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/imf.Tpo $(DEPDIR)/imf.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/imf.cpp' object='imf.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT imf.lo -MD -MP -MF $(DEPDIR)/imf.Tpo -c -o imf.lo `test -f 'adplug/imf.cpp' || echo '$(srcdir)/'`adplug/imf.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/imf.Tpo $(DEPDIR)/imf.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/imf.cpp' object='imf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o imf.lo `test -f 'adplug/imf.cpp' || echo '$(srcdir)/'`adplug/imf.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o imf.lo `test -f 'adplug/imf.cpp' || echo '$(srcdir)/'`adplug/imf.cpp
jbm.lo: adplug/jbm.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jbm.lo -MD -MP -MF $(DEPDIR)/jbm.Tpo -c -o jbm.lo `test -f 'adplug/jbm.cpp' || echo '$(srcdir)/'`adplug/jbm.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/jbm.Tpo $(DEPDIR)/jbm.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/jbm.cpp' object='jbm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jbm.lo -MD -MP -MF $(DEPDIR)/jbm.Tpo -c -o jbm.lo `test -f 'adplug/jbm.cpp' || echo '$(srcdir)/'`adplug/jbm.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/jbm.Tpo $(DEPDIR)/jbm.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/jbm.cpp' object='jbm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jbm.lo `test -f 'adplug/jbm.cpp' || echo '$(srcdir)/'`adplug/jbm.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jbm.lo `test -f 'adplug/jbm.cpp' || echo '$(srcdir)/'`adplug/jbm.cpp
ksm.lo: adplug/ksm.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ksm.lo -MD -MP -MF $(DEPDIR)/ksm.Tpo -c -o ksm.lo `test -f 'adplug/ksm.cpp' || echo '$(srcdir)/'`adplug/ksm.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/ksm.Tpo $(DEPDIR)/ksm.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/ksm.cpp' object='ksm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ksm.lo -MD -MP -MF $(DEPDIR)/ksm.Tpo -c -o ksm.lo `test -f 'adplug/ksm.cpp' || echo '$(srcdir)/'`adplug/ksm.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ksm.Tpo $(DEPDIR)/ksm.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/ksm.cpp' object='ksm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ksm.lo `test -f 'adplug/ksm.cpp' || echo '$(srcdir)/'`adplug/ksm.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ksm.lo `test -f 'adplug/ksm.cpp' || echo '$(srcdir)/'`adplug/ksm.cpp
lds.lo: adplug/lds.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lds.lo -MD -MP -MF $(DEPDIR)/lds.Tpo -c -o lds.lo `test -f 'adplug/lds.cpp' || echo '$(srcdir)/'`adplug/lds.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/lds.Tpo $(DEPDIR)/lds.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/lds.cpp' object='lds.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lds.lo -MD -MP -MF $(DEPDIR)/lds.Tpo -c -o lds.lo `test -f 'adplug/lds.cpp' || echo '$(srcdir)/'`adplug/lds.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lds.Tpo $(DEPDIR)/lds.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/lds.cpp' object='lds.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lds.lo `test -f 'adplug/lds.cpp' || echo '$(srcdir)/'`adplug/lds.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lds.lo `test -f 'adplug/lds.cpp' || echo '$(srcdir)/'`adplug/lds.cpp
mad.lo: adplug/mad.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mad.lo -MD -MP -MF $(DEPDIR)/mad.Tpo -c -o mad.lo `test -f 'adplug/mad.cpp' || echo '$(srcdir)/'`adplug/mad.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/mad.Tpo $(DEPDIR)/mad.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/mad.cpp' object='mad.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mad.lo -MD -MP -MF $(DEPDIR)/mad.Tpo -c -o mad.lo `test -f 'adplug/mad.cpp' || echo '$(srcdir)/'`adplug/mad.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mad.Tpo $(DEPDIR)/mad.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/mad.cpp' object='mad.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mad.lo `test -f 'adplug/mad.cpp' || echo '$(srcdir)/'`adplug/mad.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mad.lo `test -f 'adplug/mad.cpp' || echo '$(srcdir)/'`adplug/mad.cpp
mid.lo: adplug/mid.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mid.lo -MD -MP -MF $(DEPDIR)/mid.Tpo -c -o mid.lo `test -f 'adplug/mid.cpp' || echo '$(srcdir)/'`adplug/mid.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/mid.Tpo $(DEPDIR)/mid.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/mid.cpp' object='mid.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mid.lo -MD -MP -MF $(DEPDIR)/mid.Tpo -c -o mid.lo `test -f 'adplug/mid.cpp' || echo '$(srcdir)/'`adplug/mid.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mid.Tpo $(DEPDIR)/mid.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/mid.cpp' object='mid.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mid.lo `test -f 'adplug/mid.cpp' || echo '$(srcdir)/'`adplug/mid.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mid.lo `test -f 'adplug/mid.cpp' || echo '$(srcdir)/'`adplug/mid.cpp
mkj.lo: adplug/mkj.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mkj.lo -MD -MP -MF $(DEPDIR)/mkj.Tpo -c -o mkj.lo `test -f 'adplug/mkj.cpp' || echo '$(srcdir)/'`adplug/mkj.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/mkj.Tpo $(DEPDIR)/mkj.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/mkj.cpp' object='mkj.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mkj.lo -MD -MP -MF $(DEPDIR)/mkj.Tpo -c -o mkj.lo `test -f 'adplug/mkj.cpp' || echo '$(srcdir)/'`adplug/mkj.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mkj.Tpo $(DEPDIR)/mkj.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/mkj.cpp' object='mkj.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mkj.lo `test -f 'adplug/mkj.cpp' || echo '$(srcdir)/'`adplug/mkj.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mkj.lo `test -f 'adplug/mkj.cpp' || echo '$(srcdir)/'`adplug/mkj.cpp
msc.lo: adplug/msc.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT msc.lo -MD -MP -MF $(DEPDIR)/msc.Tpo -c -o msc.lo `test -f 'adplug/msc.cpp' || echo '$(srcdir)/'`adplug/msc.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/msc.Tpo $(DEPDIR)/msc.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/msc.cpp' object='msc.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT msc.lo -MD -MP -MF $(DEPDIR)/msc.Tpo -c -o msc.lo `test -f 'adplug/msc.cpp' || echo '$(srcdir)/'`adplug/msc.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/msc.Tpo $(DEPDIR)/msc.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/msc.cpp' object='msc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msc.lo `test -f 'adplug/msc.cpp' || echo '$(srcdir)/'`adplug/msc.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msc.lo `test -f 'adplug/msc.cpp' || echo '$(srcdir)/'`adplug/msc.cpp
mtk.lo: adplug/mtk.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mtk.lo -MD -MP -MF $(DEPDIR)/mtk.Tpo -c -o mtk.lo `test -f 'adplug/mtk.cpp' || echo '$(srcdir)/'`adplug/mtk.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/mtk.Tpo $(DEPDIR)/mtk.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/mtk.cpp' object='mtk.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mtk.lo -MD -MP -MF $(DEPDIR)/mtk.Tpo -c -o mtk.lo `test -f 'adplug/mtk.cpp' || echo '$(srcdir)/'`adplug/mtk.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mtk.Tpo $(DEPDIR)/mtk.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/mtk.cpp' object='mtk.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mtk.lo `test -f 'adplug/mtk.cpp' || echo '$(srcdir)/'`adplug/mtk.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mtk.lo `test -f 'adplug/mtk.cpp' || echo '$(srcdir)/'`adplug/mtk.cpp
player.lo: adplug/player.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.lo -MD -MP -MF $(DEPDIR)/player.Tpo -c -o player.lo `test -f 'adplug/player.cpp' || echo '$(srcdir)/'`adplug/player.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/player.Tpo $(DEPDIR)/player.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/player.cpp' object='player.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.lo -MD -MP -MF $(DEPDIR)/player.Tpo -c -o player.lo `test -f 'adplug/player.cpp' || echo '$(srcdir)/'`adplug/player.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/player.Tpo $(DEPDIR)/player.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/player.cpp' object='player.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.lo `test -f 'adplug/player.cpp' || echo '$(srcdir)/'`adplug/player.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.lo `test -f 'adplug/player.cpp' || echo '$(srcdir)/'`adplug/player.cpp
players.lo: adplug/players.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT players.lo -MD -MP -MF $(DEPDIR)/players.Tpo -c -o players.lo `test -f 'adplug/players.cpp' || echo '$(srcdir)/'`adplug/players.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/players.Tpo $(DEPDIR)/players.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/players.cpp' object='players.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT players.lo -MD -MP -MF $(DEPDIR)/players.Tpo -c -o players.lo `test -f 'adplug/players.cpp' || echo '$(srcdir)/'`adplug/players.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/players.Tpo $(DEPDIR)/players.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/players.cpp' object='players.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o players.lo `test -f 'adplug/players.cpp' || echo '$(srcdir)/'`adplug/players.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o players.lo `test -f 'adplug/players.cpp' || echo '$(srcdir)/'`adplug/players.cpp
protrack.lo: adplug/protrack.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT protrack.lo -MD -MP -MF $(DEPDIR)/protrack.Tpo -c -o protrack.lo `test -f 'adplug/protrack.cpp' || echo '$(srcdir)/'`adplug/protrack.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protrack.Tpo $(DEPDIR)/protrack.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/protrack.cpp' object='protrack.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT protrack.lo -MD -MP -MF $(DEPDIR)/protrack.Tpo -c -o protrack.lo `test -f 'adplug/protrack.cpp' || echo '$(srcdir)/'`adplug/protrack.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/protrack.Tpo $(DEPDIR)/protrack.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/protrack.cpp' object='protrack.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o protrack.lo `test -f 'adplug/protrack.cpp' || echo '$(srcdir)/'`adplug/protrack.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o protrack.lo `test -f 'adplug/protrack.cpp' || echo '$(srcdir)/'`adplug/protrack.cpp
psi.lo: adplug/psi.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT psi.lo -MD -MP -MF $(DEPDIR)/psi.Tpo -c -o psi.lo `test -f 'adplug/psi.cpp' || echo '$(srcdir)/'`adplug/psi.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/psi.Tpo $(DEPDIR)/psi.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/psi.cpp' object='psi.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT psi.lo -MD -MP -MF $(DEPDIR)/psi.Tpo -c -o psi.lo `test -f 'adplug/psi.cpp' || echo '$(srcdir)/'`adplug/psi.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/psi.Tpo $(DEPDIR)/psi.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/psi.cpp' object='psi.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o psi.lo `test -f 'adplug/psi.cpp' || echo '$(srcdir)/'`adplug/psi.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o psi.lo `test -f 'adplug/psi.cpp' || echo '$(srcdir)/'`adplug/psi.cpp
rad.lo: adplug/rad.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rad.lo -MD -MP -MF $(DEPDIR)/rad.Tpo -c -o rad.lo `test -f 'adplug/rad.cpp' || echo '$(srcdir)/'`adplug/rad.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rad.Tpo $(DEPDIR)/rad.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/rad.cpp' object='rad.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rad.lo -MD -MP -MF $(DEPDIR)/rad.Tpo -c -o rad.lo `test -f 'adplug/rad.cpp' || echo '$(srcdir)/'`adplug/rad.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rad.Tpo $(DEPDIR)/rad.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/rad.cpp' object='rad.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rad.lo `test -f 'adplug/rad.cpp' || echo '$(srcdir)/'`adplug/rad.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rad.lo `test -f 'adplug/rad.cpp' || echo '$(srcdir)/'`adplug/rad.cpp
rat.lo: adplug/rat.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rat.lo -MD -MP -MF $(DEPDIR)/rat.Tpo -c -o rat.lo `test -f 'adplug/rat.cpp' || echo '$(srcdir)/'`adplug/rat.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rat.Tpo $(DEPDIR)/rat.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/rat.cpp' object='rat.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rat.lo -MD -MP -MF $(DEPDIR)/rat.Tpo -c -o rat.lo `test -f 'adplug/rat.cpp' || echo '$(srcdir)/'`adplug/rat.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rat.Tpo $(DEPDIR)/rat.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/rat.cpp' object='rat.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rat.lo `test -f 'adplug/rat.cpp' || echo '$(srcdir)/'`adplug/rat.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rat.lo `test -f 'adplug/rat.cpp' || echo '$(srcdir)/'`adplug/rat.cpp
raw.lo: adplug/raw.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT raw.lo -MD -MP -MF $(DEPDIR)/raw.Tpo -c -o raw.lo `test -f 'adplug/raw.cpp' || echo '$(srcdir)/'`adplug/raw.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/raw.Tpo $(DEPDIR)/raw.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/raw.cpp' object='raw.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT raw.lo -MD -MP -MF $(DEPDIR)/raw.Tpo -c -o raw.lo `test -f 'adplug/raw.cpp' || echo '$(srcdir)/'`adplug/raw.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/raw.Tpo $(DEPDIR)/raw.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/raw.cpp' object='raw.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o raw.lo `test -f 'adplug/raw.cpp' || echo '$(srcdir)/'`adplug/raw.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o raw.lo `test -f 'adplug/raw.cpp' || echo '$(srcdir)/'`adplug/raw.cpp
realopl.lo: adplug/realopl.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT realopl.lo -MD -MP -MF $(DEPDIR)/realopl.Tpo -c -o realopl.lo `test -f 'adplug/realopl.cpp' || echo '$(srcdir)/'`adplug/realopl.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/realopl.Tpo $(DEPDIR)/realopl.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/realopl.cpp' object='realopl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT realopl.lo -MD -MP -MF $(DEPDIR)/realopl.Tpo -c -o realopl.lo `test -f 'adplug/realopl.cpp' || echo '$(srcdir)/'`adplug/realopl.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/realopl.Tpo $(DEPDIR)/realopl.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/realopl.cpp' object='realopl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o realopl.lo `test -f 'adplug/realopl.cpp' || echo '$(srcdir)/'`adplug/realopl.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o realopl.lo `test -f 'adplug/realopl.cpp' || echo '$(srcdir)/'`adplug/realopl.cpp
rix.lo: adplug/rix.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rix.lo -MD -MP -MF $(DEPDIR)/rix.Tpo -c -o rix.lo `test -f 'adplug/rix.cpp' || echo '$(srcdir)/'`adplug/rix.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rix.Tpo $(DEPDIR)/rix.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/rix.cpp' object='rix.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rix.lo -MD -MP -MF $(DEPDIR)/rix.Tpo -c -o rix.lo `test -f 'adplug/rix.cpp' || echo '$(srcdir)/'`adplug/rix.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rix.Tpo $(DEPDIR)/rix.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/rix.cpp' object='rix.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rix.lo `test -f 'adplug/rix.cpp' || echo '$(srcdir)/'`adplug/rix.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rix.lo `test -f 'adplug/rix.cpp' || echo '$(srcdir)/'`adplug/rix.cpp
rol.lo: adplug/rol.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rol.lo -MD -MP -MF $(DEPDIR)/rol.Tpo -c -o rol.lo `test -f 'adplug/rol.cpp' || echo '$(srcdir)/'`adplug/rol.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/rol.Tpo $(DEPDIR)/rol.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/rol.cpp' object='rol.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rol.lo -MD -MP -MF $(DEPDIR)/rol.Tpo -c -o rol.lo `test -f 'adplug/rol.cpp' || echo '$(srcdir)/'`adplug/rol.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rol.Tpo $(DEPDIR)/rol.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/rol.cpp' object='rol.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rol.lo `test -f 'adplug/rol.cpp' || echo '$(srcdir)/'`adplug/rol.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rol.lo `test -f 'adplug/rol.cpp' || echo '$(srcdir)/'`adplug/rol.cpp
s3m.lo: adplug/s3m.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT s3m.lo -MD -MP -MF $(DEPDIR)/s3m.Tpo -c -o s3m.lo `test -f 'adplug/s3m.cpp' || echo '$(srcdir)/'`adplug/s3m.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/s3m.Tpo $(DEPDIR)/s3m.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/s3m.cpp' object='s3m.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT s3m.lo -MD -MP -MF $(DEPDIR)/s3m.Tpo -c -o s3m.lo `test -f 'adplug/s3m.cpp' || echo '$(srcdir)/'`adplug/s3m.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/s3m.Tpo $(DEPDIR)/s3m.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/s3m.cpp' object='s3m.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o s3m.lo `test -f 'adplug/s3m.cpp' || echo '$(srcdir)/'`adplug/s3m.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o s3m.lo `test -f 'adplug/s3m.cpp' || echo '$(srcdir)/'`adplug/s3m.cpp
sa2.lo: adplug/sa2.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sa2.lo -MD -MP -MF $(DEPDIR)/sa2.Tpo -c -o sa2.lo `test -f 'adplug/sa2.cpp' || echo '$(srcdir)/'`adplug/sa2.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/sa2.Tpo $(DEPDIR)/sa2.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/sa2.cpp' object='sa2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sa2.lo -MD -MP -MF $(DEPDIR)/sa2.Tpo -c -o sa2.lo `test -f 'adplug/sa2.cpp' || echo '$(srcdir)/'`adplug/sa2.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sa2.Tpo $(DEPDIR)/sa2.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/sa2.cpp' object='sa2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sa2.lo `test -f 'adplug/sa2.cpp' || echo '$(srcdir)/'`adplug/sa2.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sa2.lo `test -f 'adplug/sa2.cpp' || echo '$(srcdir)/'`adplug/sa2.cpp
sng.lo: adplug/sng.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sng.lo -MD -MP -MF $(DEPDIR)/sng.Tpo -c -o sng.lo `test -f 'adplug/sng.cpp' || echo '$(srcdir)/'`adplug/sng.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/sng.Tpo $(DEPDIR)/sng.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/sng.cpp' object='sng.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sng.lo -MD -MP -MF $(DEPDIR)/sng.Tpo -c -o sng.lo `test -f 'adplug/sng.cpp' || echo '$(srcdir)/'`adplug/sng.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sng.Tpo $(DEPDIR)/sng.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/sng.cpp' object='sng.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sng.lo `test -f 'adplug/sng.cpp' || echo '$(srcdir)/'`adplug/sng.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sng.lo `test -f 'adplug/sng.cpp' || echo '$(srcdir)/'`adplug/sng.cpp
surroundopl.lo: adplug/surroundopl.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT surroundopl.lo -MD -MP -MF $(DEPDIR)/surroundopl.Tpo -c -o surroundopl.lo `test -f 'adplug/surroundopl.cpp' || echo '$(srcdir)/'`adplug/surroundopl.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/surroundopl.Tpo $(DEPDIR)/surroundopl.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/surroundopl.cpp' object='surroundopl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT surroundopl.lo -MD -MP -MF $(DEPDIR)/surroundopl.Tpo -c -o surroundopl.lo `test -f 'adplug/surroundopl.cpp' || echo '$(srcdir)/'`adplug/surroundopl.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/surroundopl.Tpo $(DEPDIR)/surroundopl.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/surroundopl.cpp' object='surroundopl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o surroundopl.lo `test -f 'adplug/surroundopl.cpp' || echo '$(srcdir)/'`adplug/surroundopl.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o surroundopl.lo `test -f 'adplug/surroundopl.cpp' || echo '$(srcdir)/'`adplug/surroundopl.cpp
temuopl.lo: adplug/temuopl.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT temuopl.lo -MD -MP -MF $(DEPDIR)/temuopl.Tpo -c -o temuopl.lo `test -f 'adplug/temuopl.cpp' || echo '$(srcdir)/'`adplug/temuopl.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/temuopl.Tpo $(DEPDIR)/temuopl.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/temuopl.cpp' object='temuopl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT temuopl.lo -MD -MP -MF $(DEPDIR)/temuopl.Tpo -c -o temuopl.lo `test -f 'adplug/temuopl.cpp' || echo '$(srcdir)/'`adplug/temuopl.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/temuopl.Tpo $(DEPDIR)/temuopl.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/temuopl.cpp' object='temuopl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o temuopl.lo `test -f 'adplug/temuopl.cpp' || echo '$(srcdir)/'`adplug/temuopl.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o temuopl.lo `test -f 'adplug/temuopl.cpp' || echo '$(srcdir)/'`adplug/temuopl.cpp
u6m.lo: adplug/u6m.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT u6m.lo -MD -MP -MF $(DEPDIR)/u6m.Tpo -c -o u6m.lo `test -f 'adplug/u6m.cpp' || echo '$(srcdir)/'`adplug/u6m.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/u6m.Tpo $(DEPDIR)/u6m.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/u6m.cpp' object='u6m.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT u6m.lo -MD -MP -MF $(DEPDIR)/u6m.Tpo -c -o u6m.lo `test -f 'adplug/u6m.cpp' || echo '$(srcdir)/'`adplug/u6m.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/u6m.Tpo $(DEPDIR)/u6m.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/u6m.cpp' object='u6m.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o u6m.lo `test -f 'adplug/u6m.cpp' || echo '$(srcdir)/'`adplug/u6m.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o u6m.lo `test -f 'adplug/u6m.cpp' || echo '$(srcdir)/'`adplug/u6m.cpp
xad.lo: adplug/xad.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xad.lo -MD -MP -MF $(DEPDIR)/xad.Tpo -c -o xad.lo `test -f 'adplug/xad.cpp' || echo '$(srcdir)/'`adplug/xad.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/xad.Tpo $(DEPDIR)/xad.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/xad.cpp' object='xad.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xad.lo -MD -MP -MF $(DEPDIR)/xad.Tpo -c -o xad.lo `test -f 'adplug/xad.cpp' || echo '$(srcdir)/'`adplug/xad.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xad.Tpo $(DEPDIR)/xad.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/xad.cpp' object='xad.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xad.lo `test -f 'adplug/xad.cpp' || echo '$(srcdir)/'`adplug/xad.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xad.lo `test -f 'adplug/xad.cpp' || echo '$(srcdir)/'`adplug/xad.cpp
xsm.lo: adplug/xsm.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xsm.lo -MD -MP -MF $(DEPDIR)/xsm.Tpo -c -o xsm.lo `test -f 'adplug/xsm.cpp' || echo '$(srcdir)/'`adplug/xsm.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/xsm.Tpo $(DEPDIR)/xsm.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='adplug/xsm.cpp' object='xsm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xsm.lo -MD -MP -MF $(DEPDIR)/xsm.Tpo -c -o xsm.lo `test -f 'adplug/xsm.cpp' || echo '$(srcdir)/'`adplug/xsm.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xsm.Tpo $(DEPDIR)/xsm.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='adplug/xsm.cpp' object='xsm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xsm.lo `test -f 'adplug/xsm.cpp' || echo '$(srcdir)/'`adplug/xsm.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xsm.lo `test -f 'adplug/xsm.cpp' || echo '$(srcdir)/'`adplug/xsm.cpp
mostlyclean-libtool:
-rm -f *.lo
@@@ -1151,26 -1247,15 +1274,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -1182,15 -1267,11 +1294,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -1199,6 -1280,21 +1307,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -1343,19 -1439,20 +1466,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# adplug/database.cpp
diff --combined plugins/alac/Makefile.in
index eb2ab7c,e467475..4c0d01b
--- a/plugins/alac/Makefile.in
+++ b/plugins/alac/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/alac
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -117,23 -145,48 +169,48 @@@ am__alac_la_SOURCES_DIST = alac_plugin.
@HAVE_ALAC_TRUE at am_alac_la_OBJECTS = alac_plugin.lo alac.lo demux.lo \
@HAVE_ALAC_TRUE@ stream.lo
alac_la_OBJECTS = $(am_alac_la_OBJECTS)
- alac_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(alac_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ alac_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(alac_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_ALAC_TRUE at am_alac_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(alac_la_SOURCES)
DIST_SOURCES = $(am__alac_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -141,6 -194,23 +218,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -167,6 -237,7 +264,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -187,10 -258,12 +285,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -213,6 -286,7 +313,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -266,6 -340,7 +367,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -284,6 -359,8 +386,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -309,13 -386,17 +413,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -324,7 -405,9 +432,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -387,7 -470,7 +497,7 @@@ top_srcdir = @top_srcdir
@HAVE_ALAC_TRUE at alac_la_SOURCES = alac_plugin.c\
@HAVE_ALAC_TRUE at alac.c decomp.h demux.c demux.h stream.c stream.h
- @HAVE_ALAC_TRUE at alac_la_LDFLAGS = -module
+ @HAVE_ALAC_TRUE at alac_la_LDFLAGS = -module -avoid-version
@HAVE_ALAC_TRUE at alac_la_LIBADD = $(LDADD) $(FAAD2_LIBS) ../libmp4ff/libmp4ff.a
@HAVE_ALAC_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING -I at top_srcdir@/plugins/libmp4ff
all: all-am
@@@ -424,6 -507,7 +534,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -450,14 -534,17 +561,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
alac.la: $(alac_la_OBJECTS) $(alac_la_DEPENDENCIES) $(EXTRA_alac_la_DEPENDENCIES)
- $(alac_la_LINK) $(am_alac_la_rpath) $(alac_la_OBJECTS) $(alac_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(alac_la_LINK) $(am_alac_la_rpath) $(alac_la_OBJECTS) $(alac_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -471,25 -558,25 +585,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/stream.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -497,26 -584,15 +611,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -528,15 -604,11 +631,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -545,6 -617,21 +644,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -689,19 -776,20 +803,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/alsa/Makefile.in
index c6b820e,1723f5b..d1654d5
--- a/plugins/alsa/Makefile.in
+++ b/plugins/alsa/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/alsa
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -114,23 -142,48 +166,48 @@@ am__DEPENDENCIES_1
am__alsa_la_SOURCES_DIST = alsa.c
@HAVE_ALSA_TRUE at am_alsa_la_OBJECTS = alsa.lo
alsa_la_OBJECTS = $(am_alsa_la_OBJECTS)
- alsa_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(alsa_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ alsa_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(alsa_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_ALSA_TRUE at am_alsa_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(alsa_la_SOURCES)
DIST_SOURCES = $(am__alsa_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -191,23 +215,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -234,7 +261,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -255,12 +282,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -283,7 +310,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -337,7 +364,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -356,8 +383,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -383,17 +410,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -402,9 +429,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,7 -465,7 +492,7 @@@ top_srcdir = @top_srcdir
@HAVE_ALSA_TRUE at alsadir = $(libdir)/$(PACKAGE)
@HAVE_ALSA_TRUE at pkglib_LTLIBRARIES = alsa.la
@HAVE_ALSA_TRUE at alsa_la_SOURCES = alsa.c
- @HAVE_ALSA_TRUE at alsa_la_LDFLAGS = -module
+ @HAVE_ALSA_TRUE at alsa_la_LDFLAGS = -module -avoid-version
@HAVE_ALSA_TRUE at alsa_la_LIBADD = $(LDADD) $(ALSA_DEPS_LIBS)
@HAVE_ALSA_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 $(ALSA_DEPS_CFLAGS)
all: all-am
@@@ -419,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
alsa.la: $(alsa_la_OBJECTS) $(alsa_la_DEPENDENCIES) $(EXTRA_alsa_la_DEPENDENCIES)
- $(alsa_la_LINK) $(am_alsa_la_rpath) $(alsa_la_OBJECTS) $(alsa_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(alsa_la_LINK) $(am_alsa_la_rpath) $(alsa_la_OBJECTS) $(alsa_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/alsa.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/ao/Makefile.in
index 44d8a25,b200d67..f10c412
--- a/plugins/ao/Makefile.in
+++ b/plugins/ao/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/ao
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -146,23 -174,48 +198,48 @@@ am__ddb_ao_la_SOURCES_DIST = plugin.c m
@HAVE_PSF_TRUE@ psx_hw.lo spu.lo eng_psf2.lo spu2.lo dma2.lo \
@HAVE_PSF_TRUE@ registers2.lo eng_spu.lo
ddb_ao_la_OBJECTS = $(am_ddb_ao_la_OBJECTS)
- ddb_ao_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ ddb_ao_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(ddb_ao_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_PSF_TRUE at am_ddb_ao_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(ddb_ao_la_SOURCES)
DIST_SOURCES = $(am__ddb_ao_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -170,6 -223,23 +247,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -196,6 -266,7 +293,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -216,10 -287,12 +314,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -242,6 -315,7 +342,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -295,6 -369,7 +396,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -313,6 -388,8 +415,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -338,13 -415,17 +442,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -353,7 -434,9 +461,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -429,10 -512,10 +539,10 @@@ top_srcdir = @top_srcdir
@HAVE_PSF_TRUE at eng_psf/peops/adsr.h eng_psf/peops/dma.h eng_psf/peops/externals.h eng_psf/peops/gauss_i.h eng_psf/peops/registers.h eng_psf/peops/regs.h eng_psf/peops/spu.h eng_psf/peops/stdafx.h\
@HAVE_PSF_TRUE at eng_psf/peops2/adsr.h eng_psf/peops2/dma.h eng_psf/peops2/externals.h eng_psf/peops2/gauss_i.h eng_psf/peops2/psemuxa.h eng_psf/peops2/registers.h eng_psf/peops2/regs.h eng_psf/peops2/reverb.h eng_psf/peops2/spu.h eng_psf/peops2/stdafx.h
- @HAVE_PSF_TRUE at ddb_ao_la_LDFLAGS = -module $(ZLIB_LIBS)
+ @HAVE_PSF_TRUE at ddb_ao_la_LDFLAGS = -module -avoid-version $(ZLIB_LIBS)
@HAVE_PSF_TRUE at EXTRA_DIST = eng_psf/peops/reverb.c eng_psf/peops/adsr.c eng_psf/peops/registers.c eng_psf/peops/dma.c eng_psf/peops2/spu2.c eng_psf/peops2/reverb2.c eng_psf/peops2/adsr2.c eng_dsf/arm7memil.c eng_dsf/aicalfo.c eng_ssf/scsplfo.c
@HAVE_PSF_TRUE at ddb_ao_la_LIBADD = $(LDADD)
- @HAVE_PSF_TRUE at AM_CFLAGS = $(CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm -fPIC
+ @HAVE_PSF_TRUE at AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm -fPIC
all: all-am
.SUFFIXES:
@@@ -467,6 -550,7 +577,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -493,14 -577,17 +604,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
ddb_ao.la: $(ddb_ao_la_OBJECTS) $(ddb_ao_la_DEPENDENCIES) $(EXTRA_ddb_ao_la_DEPENDENCIES)
- $(ddb_ao_la_LINK) $(am_ddb_ao_la_rpath) $(ddb_ao_la_OBJECTS) $(ddb_ao_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(ddb_ao_la_LINK) $(am_ddb_ao_la_rpath) $(ddb_ao_la_OBJECTS) $(ddb_ao_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -542,228 -629,228 +656,228 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/z80dasm.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
eng_dsf.lo: eng_dsf/eng_dsf.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_dsf.lo -MD -MP -MF $(DEPDIR)/eng_dsf.Tpo -c -o eng_dsf.lo `test -f 'eng_dsf/eng_dsf.c' || echo '$(srcdir)/'`eng_dsf/eng_dsf.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/eng_dsf.Tpo $(DEPDIR)/eng_dsf.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_dsf/eng_dsf.c' object='eng_dsf.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_dsf.lo -MD -MP -MF $(DEPDIR)/eng_dsf.Tpo -c -o eng_dsf.lo `test -f 'eng_dsf/eng_dsf.c' || echo '$(srcdir)/'`eng_dsf/eng_dsf.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eng_dsf.Tpo $(DEPDIR)/eng_dsf.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_dsf/eng_dsf.c' object='eng_dsf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_dsf.lo `test -f 'eng_dsf/eng_dsf.c' || echo '$(srcdir)/'`eng_dsf/eng_dsf.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_dsf.lo `test -f 'eng_dsf/eng_dsf.c' || echo '$(srcdir)/'`eng_dsf/eng_dsf.c
dc_hw.lo: eng_dsf/dc_hw.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dc_hw.lo -MD -MP -MF $(DEPDIR)/dc_hw.Tpo -c -o dc_hw.lo `test -f 'eng_dsf/dc_hw.c' || echo '$(srcdir)/'`eng_dsf/dc_hw.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/dc_hw.Tpo $(DEPDIR)/dc_hw.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_dsf/dc_hw.c' object='dc_hw.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dc_hw.lo -MD -MP -MF $(DEPDIR)/dc_hw.Tpo -c -o dc_hw.lo `test -f 'eng_dsf/dc_hw.c' || echo '$(srcdir)/'`eng_dsf/dc_hw.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dc_hw.Tpo $(DEPDIR)/dc_hw.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_dsf/dc_hw.c' object='dc_hw.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dc_hw.lo `test -f 'eng_dsf/dc_hw.c' || echo '$(srcdir)/'`eng_dsf/dc_hw.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dc_hw.lo `test -f 'eng_dsf/dc_hw.c' || echo '$(srcdir)/'`eng_dsf/dc_hw.c
aica.lo: eng_dsf/aica.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aica.lo -MD -MP -MF $(DEPDIR)/aica.Tpo -c -o aica.lo `test -f 'eng_dsf/aica.c' || echo '$(srcdir)/'`eng_dsf/aica.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/aica.Tpo $(DEPDIR)/aica.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_dsf/aica.c' object='aica.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aica.lo -MD -MP -MF $(DEPDIR)/aica.Tpo -c -o aica.lo `test -f 'eng_dsf/aica.c' || echo '$(srcdir)/'`eng_dsf/aica.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/aica.Tpo $(DEPDIR)/aica.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_dsf/aica.c' object='aica.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aica.lo `test -f 'eng_dsf/aica.c' || echo '$(srcdir)/'`eng_dsf/aica.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aica.lo `test -f 'eng_dsf/aica.c' || echo '$(srcdir)/'`eng_dsf/aica.c
aicadsp.lo: eng_dsf/aicadsp.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aicadsp.lo -MD -MP -MF $(DEPDIR)/aicadsp.Tpo -c -o aicadsp.lo `test -f 'eng_dsf/aicadsp.c' || echo '$(srcdir)/'`eng_dsf/aicadsp.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/aicadsp.Tpo $(DEPDIR)/aicadsp.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_dsf/aicadsp.c' object='aicadsp.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aicadsp.lo -MD -MP -MF $(DEPDIR)/aicadsp.Tpo -c -o aicadsp.lo `test -f 'eng_dsf/aicadsp.c' || echo '$(srcdir)/'`eng_dsf/aicadsp.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/aicadsp.Tpo $(DEPDIR)/aicadsp.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_dsf/aicadsp.c' object='aicadsp.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aicadsp.lo `test -f 'eng_dsf/aicadsp.c' || echo '$(srcdir)/'`eng_dsf/aicadsp.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aicadsp.lo `test -f 'eng_dsf/aicadsp.c' || echo '$(srcdir)/'`eng_dsf/aicadsp.c
arm7.lo: eng_dsf/arm7.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT arm7.lo -MD -MP -MF $(DEPDIR)/arm7.Tpo -c -o arm7.lo `test -f 'eng_dsf/arm7.c' || echo '$(srcdir)/'`eng_dsf/arm7.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/arm7.Tpo $(DEPDIR)/arm7.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_dsf/arm7.c' object='arm7.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT arm7.lo -MD -MP -MF $(DEPDIR)/arm7.Tpo -c -o arm7.lo `test -f 'eng_dsf/arm7.c' || echo '$(srcdir)/'`eng_dsf/arm7.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/arm7.Tpo $(DEPDIR)/arm7.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_dsf/arm7.c' object='arm7.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arm7.lo `test -f 'eng_dsf/arm7.c' || echo '$(srcdir)/'`eng_dsf/arm7.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arm7.lo `test -f 'eng_dsf/arm7.c' || echo '$(srcdir)/'`eng_dsf/arm7.c
arm7i.lo: eng_dsf/arm7i.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT arm7i.lo -MD -MP -MF $(DEPDIR)/arm7i.Tpo -c -o arm7i.lo `test -f 'eng_dsf/arm7i.c' || echo '$(srcdir)/'`eng_dsf/arm7i.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/arm7i.Tpo $(DEPDIR)/arm7i.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_dsf/arm7i.c' object='arm7i.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT arm7i.lo -MD -MP -MF $(DEPDIR)/arm7i.Tpo -c -o arm7i.lo `test -f 'eng_dsf/arm7i.c' || echo '$(srcdir)/'`eng_dsf/arm7i.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/arm7i.Tpo $(DEPDIR)/arm7i.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_dsf/arm7i.c' object='arm7i.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arm7i.lo `test -f 'eng_dsf/arm7i.c' || echo '$(srcdir)/'`eng_dsf/arm7i.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arm7i.lo `test -f 'eng_dsf/arm7i.c' || echo '$(srcdir)/'`eng_dsf/arm7i.c
m68kcpu.lo: eng_ssf/m68kcpu.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kcpu.lo -MD -MP -MF $(DEPDIR)/m68kcpu.Tpo -c -o m68kcpu.lo `test -f 'eng_ssf/m68kcpu.c' || echo '$(srcdir)/'`eng_ssf/m68kcpu.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/m68kcpu.Tpo $(DEPDIR)/m68kcpu.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_ssf/m68kcpu.c' object='m68kcpu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kcpu.lo -MD -MP -MF $(DEPDIR)/m68kcpu.Tpo -c -o m68kcpu.lo `test -f 'eng_ssf/m68kcpu.c' || echo '$(srcdir)/'`eng_ssf/m68kcpu.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/m68kcpu.Tpo $(DEPDIR)/m68kcpu.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_ssf/m68kcpu.c' object='m68kcpu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kcpu.lo `test -f 'eng_ssf/m68kcpu.c' || echo '$(srcdir)/'`eng_ssf/m68kcpu.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kcpu.lo `test -f 'eng_ssf/m68kcpu.c' || echo '$(srcdir)/'`eng_ssf/m68kcpu.c
m68kopac.lo: eng_ssf/m68kopac.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopac.lo -MD -MP -MF $(DEPDIR)/m68kopac.Tpo -c -o m68kopac.lo `test -f 'eng_ssf/m68kopac.c' || echo '$(srcdir)/'`eng_ssf/m68kopac.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/m68kopac.Tpo $(DEPDIR)/m68kopac.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_ssf/m68kopac.c' object='m68kopac.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopac.lo -MD -MP -MF $(DEPDIR)/m68kopac.Tpo -c -o m68kopac.lo `test -f 'eng_ssf/m68kopac.c' || echo '$(srcdir)/'`eng_ssf/m68kopac.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/m68kopac.Tpo $(DEPDIR)/m68kopac.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_ssf/m68kopac.c' object='m68kopac.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopac.lo `test -f 'eng_ssf/m68kopac.c' || echo '$(srcdir)/'`eng_ssf/m68kopac.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopac.lo `test -f 'eng_ssf/m68kopac.c' || echo '$(srcdir)/'`eng_ssf/m68kopac.c
m68kopdm.lo: eng_ssf/m68kopdm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopdm.lo -MD -MP -MF $(DEPDIR)/m68kopdm.Tpo -c -o m68kopdm.lo `test -f 'eng_ssf/m68kopdm.c' || echo '$(srcdir)/'`eng_ssf/m68kopdm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/m68kopdm.Tpo $(DEPDIR)/m68kopdm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_ssf/m68kopdm.c' object='m68kopdm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopdm.lo -MD -MP -MF $(DEPDIR)/m68kopdm.Tpo -c -o m68kopdm.lo `test -f 'eng_ssf/m68kopdm.c' || echo '$(srcdir)/'`eng_ssf/m68kopdm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/m68kopdm.Tpo $(DEPDIR)/m68kopdm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_ssf/m68kopdm.c' object='m68kopdm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopdm.lo `test -f 'eng_ssf/m68kopdm.c' || echo '$(srcdir)/'`eng_ssf/m68kopdm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopdm.lo `test -f 'eng_ssf/m68kopdm.c' || echo '$(srcdir)/'`eng_ssf/m68kopdm.c
m68kopnz.lo: eng_ssf/m68kopnz.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopnz.lo -MD -MP -MF $(DEPDIR)/m68kopnz.Tpo -c -o m68kopnz.lo `test -f 'eng_ssf/m68kopnz.c' || echo '$(srcdir)/'`eng_ssf/m68kopnz.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/m68kopnz.Tpo $(DEPDIR)/m68kopnz.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_ssf/m68kopnz.c' object='m68kopnz.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopnz.lo -MD -MP -MF $(DEPDIR)/m68kopnz.Tpo -c -o m68kopnz.lo `test -f 'eng_ssf/m68kopnz.c' || echo '$(srcdir)/'`eng_ssf/m68kopnz.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/m68kopnz.Tpo $(DEPDIR)/m68kopnz.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_ssf/m68kopnz.c' object='m68kopnz.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopnz.lo `test -f 'eng_ssf/m68kopnz.c' || echo '$(srcdir)/'`eng_ssf/m68kopnz.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopnz.lo `test -f 'eng_ssf/m68kopnz.c' || echo '$(srcdir)/'`eng_ssf/m68kopnz.c
m68kops.lo: eng_ssf/m68kops.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kops.lo -MD -MP -MF $(DEPDIR)/m68kops.Tpo -c -o m68kops.lo `test -f 'eng_ssf/m68kops.c' || echo '$(srcdir)/'`eng_ssf/m68kops.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/m68kops.Tpo $(DEPDIR)/m68kops.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_ssf/m68kops.c' object='m68kops.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kops.lo -MD -MP -MF $(DEPDIR)/m68kops.Tpo -c -o m68kops.lo `test -f 'eng_ssf/m68kops.c' || echo '$(srcdir)/'`eng_ssf/m68kops.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/m68kops.Tpo $(DEPDIR)/m68kops.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_ssf/m68kops.c' object='m68kops.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kops.lo `test -f 'eng_ssf/m68kops.c' || echo '$(srcdir)/'`eng_ssf/m68kops.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kops.lo `test -f 'eng_ssf/m68kops.c' || echo '$(srcdir)/'`eng_ssf/m68kops.c
scsp.lo: eng_ssf/scsp.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scsp.lo -MD -MP -MF $(DEPDIR)/scsp.Tpo -c -o scsp.lo `test -f 'eng_ssf/scsp.c' || echo '$(srcdir)/'`eng_ssf/scsp.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/scsp.Tpo $(DEPDIR)/scsp.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_ssf/scsp.c' object='scsp.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scsp.lo -MD -MP -MF $(DEPDIR)/scsp.Tpo -c -o scsp.lo `test -f 'eng_ssf/scsp.c' || echo '$(srcdir)/'`eng_ssf/scsp.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/scsp.Tpo $(DEPDIR)/scsp.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_ssf/scsp.c' object='scsp.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scsp.lo `test -f 'eng_ssf/scsp.c' || echo '$(srcdir)/'`eng_ssf/scsp.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scsp.lo `test -f 'eng_ssf/scsp.c' || echo '$(srcdir)/'`eng_ssf/scsp.c
scspdsp.lo: eng_ssf/scspdsp.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scspdsp.lo -MD -MP -MF $(DEPDIR)/scspdsp.Tpo -c -o scspdsp.lo `test -f 'eng_ssf/scspdsp.c' || echo '$(srcdir)/'`eng_ssf/scspdsp.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/scspdsp.Tpo $(DEPDIR)/scspdsp.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_ssf/scspdsp.c' object='scspdsp.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scspdsp.lo -MD -MP -MF $(DEPDIR)/scspdsp.Tpo -c -o scspdsp.lo `test -f 'eng_ssf/scspdsp.c' || echo '$(srcdir)/'`eng_ssf/scspdsp.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/scspdsp.Tpo $(DEPDIR)/scspdsp.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_ssf/scspdsp.c' object='scspdsp.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scspdsp.lo `test -f 'eng_ssf/scspdsp.c' || echo '$(srcdir)/'`eng_ssf/scspdsp.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scspdsp.lo `test -f 'eng_ssf/scspdsp.c' || echo '$(srcdir)/'`eng_ssf/scspdsp.c
sat_hw.lo: eng_ssf/sat_hw.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sat_hw.lo -MD -MP -MF $(DEPDIR)/sat_hw.Tpo -c -o sat_hw.lo `test -f 'eng_ssf/sat_hw.c' || echo '$(srcdir)/'`eng_ssf/sat_hw.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/sat_hw.Tpo $(DEPDIR)/sat_hw.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_ssf/sat_hw.c' object='sat_hw.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sat_hw.lo -MD -MP -MF $(DEPDIR)/sat_hw.Tpo -c -o sat_hw.lo `test -f 'eng_ssf/sat_hw.c' || echo '$(srcdir)/'`eng_ssf/sat_hw.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sat_hw.Tpo $(DEPDIR)/sat_hw.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_ssf/sat_hw.c' object='sat_hw.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sat_hw.lo `test -f 'eng_ssf/sat_hw.c' || echo '$(srcdir)/'`eng_ssf/sat_hw.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sat_hw.lo `test -f 'eng_ssf/sat_hw.c' || echo '$(srcdir)/'`eng_ssf/sat_hw.c
eng_ssf.lo: eng_ssf/eng_ssf.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_ssf.lo -MD -MP -MF $(DEPDIR)/eng_ssf.Tpo -c -o eng_ssf.lo `test -f 'eng_ssf/eng_ssf.c' || echo '$(srcdir)/'`eng_ssf/eng_ssf.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/eng_ssf.Tpo $(DEPDIR)/eng_ssf.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_ssf/eng_ssf.c' object='eng_ssf.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_ssf.lo -MD -MP -MF $(DEPDIR)/eng_ssf.Tpo -c -o eng_ssf.lo `test -f 'eng_ssf/eng_ssf.c' || echo '$(srcdir)/'`eng_ssf/eng_ssf.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eng_ssf.Tpo $(DEPDIR)/eng_ssf.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_ssf/eng_ssf.c' object='eng_ssf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_ssf.lo `test -f 'eng_ssf/eng_ssf.c' || echo '$(srcdir)/'`eng_ssf/eng_ssf.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_ssf.lo `test -f 'eng_ssf/eng_ssf.c' || echo '$(srcdir)/'`eng_ssf/eng_ssf.c
eng_qsf.lo: eng_qsf/eng_qsf.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_qsf.lo -MD -MP -MF $(DEPDIR)/eng_qsf.Tpo -c -o eng_qsf.lo `test -f 'eng_qsf/eng_qsf.c' || echo '$(srcdir)/'`eng_qsf/eng_qsf.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/eng_qsf.Tpo $(DEPDIR)/eng_qsf.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_qsf/eng_qsf.c' object='eng_qsf.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_qsf.lo -MD -MP -MF $(DEPDIR)/eng_qsf.Tpo -c -o eng_qsf.lo `test -f 'eng_qsf/eng_qsf.c' || echo '$(srcdir)/'`eng_qsf/eng_qsf.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eng_qsf.Tpo $(DEPDIR)/eng_qsf.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_qsf/eng_qsf.c' object='eng_qsf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_qsf.lo `test -f 'eng_qsf/eng_qsf.c' || echo '$(srcdir)/'`eng_qsf/eng_qsf.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_qsf.lo `test -f 'eng_qsf/eng_qsf.c' || echo '$(srcdir)/'`eng_qsf/eng_qsf.c
kabuki.lo: eng_qsf/kabuki.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT kabuki.lo -MD -MP -MF $(DEPDIR)/kabuki.Tpo -c -o kabuki.lo `test -f 'eng_qsf/kabuki.c' || echo '$(srcdir)/'`eng_qsf/kabuki.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/kabuki.Tpo $(DEPDIR)/kabuki.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_qsf/kabuki.c' object='kabuki.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT kabuki.lo -MD -MP -MF $(DEPDIR)/kabuki.Tpo -c -o kabuki.lo `test -f 'eng_qsf/kabuki.c' || echo '$(srcdir)/'`eng_qsf/kabuki.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/kabuki.Tpo $(DEPDIR)/kabuki.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_qsf/kabuki.c' object='kabuki.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o kabuki.lo `test -f 'eng_qsf/kabuki.c' || echo '$(srcdir)/'`eng_qsf/kabuki.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o kabuki.lo `test -f 'eng_qsf/kabuki.c' || echo '$(srcdir)/'`eng_qsf/kabuki.c
qsound.lo: eng_qsf/qsound.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT qsound.lo -MD -MP -MF $(DEPDIR)/qsound.Tpo -c -o qsound.lo `test -f 'eng_qsf/qsound.c' || echo '$(srcdir)/'`eng_qsf/qsound.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/qsound.Tpo $(DEPDIR)/qsound.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_qsf/qsound.c' object='qsound.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT qsound.lo -MD -MP -MF $(DEPDIR)/qsound.Tpo -c -o qsound.lo `test -f 'eng_qsf/qsound.c' || echo '$(srcdir)/'`eng_qsf/qsound.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/qsound.Tpo $(DEPDIR)/qsound.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_qsf/qsound.c' object='qsound.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o qsound.lo `test -f 'eng_qsf/qsound.c' || echo '$(srcdir)/'`eng_qsf/qsound.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o qsound.lo `test -f 'eng_qsf/qsound.c' || echo '$(srcdir)/'`eng_qsf/qsound.c
z80.lo: eng_qsf/z80.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT z80.lo -MD -MP -MF $(DEPDIR)/z80.Tpo -c -o z80.lo `test -f 'eng_qsf/z80.c' || echo '$(srcdir)/'`eng_qsf/z80.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/z80.Tpo $(DEPDIR)/z80.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_qsf/z80.c' object='z80.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT z80.lo -MD -MP -MF $(DEPDIR)/z80.Tpo -c -o z80.lo `test -f 'eng_qsf/z80.c' || echo '$(srcdir)/'`eng_qsf/z80.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/z80.Tpo $(DEPDIR)/z80.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_qsf/z80.c' object='z80.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o z80.lo `test -f 'eng_qsf/z80.c' || echo '$(srcdir)/'`eng_qsf/z80.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o z80.lo `test -f 'eng_qsf/z80.c' || echo '$(srcdir)/'`eng_qsf/z80.c
z80dasm.lo: eng_qsf/z80dasm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT z80dasm.lo -MD -MP -MF $(DEPDIR)/z80dasm.Tpo -c -o z80dasm.lo `test -f 'eng_qsf/z80dasm.c' || echo '$(srcdir)/'`eng_qsf/z80dasm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/z80dasm.Tpo $(DEPDIR)/z80dasm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_qsf/z80dasm.c' object='z80dasm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT z80dasm.lo -MD -MP -MF $(DEPDIR)/z80dasm.Tpo -c -o z80dasm.lo `test -f 'eng_qsf/z80dasm.c' || echo '$(srcdir)/'`eng_qsf/z80dasm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/z80dasm.Tpo $(DEPDIR)/z80dasm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_qsf/z80dasm.c' object='z80dasm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o z80dasm.lo `test -f 'eng_qsf/z80dasm.c' || echo '$(srcdir)/'`eng_qsf/z80dasm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o z80dasm.lo `test -f 'eng_qsf/z80dasm.c' || echo '$(srcdir)/'`eng_qsf/z80dasm.c
eng_psf.lo: eng_psf/eng_psf.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_psf.lo -MD -MP -MF $(DEPDIR)/eng_psf.Tpo -c -o eng_psf.lo `test -f 'eng_psf/eng_psf.c' || echo '$(srcdir)/'`eng_psf/eng_psf.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/eng_psf.Tpo $(DEPDIR)/eng_psf.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_psf/eng_psf.c' object='eng_psf.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_psf.lo -MD -MP -MF $(DEPDIR)/eng_psf.Tpo -c -o eng_psf.lo `test -f 'eng_psf/eng_psf.c' || echo '$(srcdir)/'`eng_psf/eng_psf.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eng_psf.Tpo $(DEPDIR)/eng_psf.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_psf/eng_psf.c' object='eng_psf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_psf.lo `test -f 'eng_psf/eng_psf.c' || echo '$(srcdir)/'`eng_psf/eng_psf.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_psf.lo `test -f 'eng_psf/eng_psf.c' || echo '$(srcdir)/'`eng_psf/eng_psf.c
psx.lo: eng_psf/psx.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psx.lo -MD -MP -MF $(DEPDIR)/psx.Tpo -c -o psx.lo `test -f 'eng_psf/psx.c' || echo '$(srcdir)/'`eng_psf/psx.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/psx.Tpo $(DEPDIR)/psx.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_psf/psx.c' object='psx.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psx.lo -MD -MP -MF $(DEPDIR)/psx.Tpo -c -o psx.lo `test -f 'eng_psf/psx.c' || echo '$(srcdir)/'`eng_psf/psx.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/psx.Tpo $(DEPDIR)/psx.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_psf/psx.c' object='psx.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psx.lo `test -f 'eng_psf/psx.c' || echo '$(srcdir)/'`eng_psf/psx.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psx.lo `test -f 'eng_psf/psx.c' || echo '$(srcdir)/'`eng_psf/psx.c
psx_hw.lo: eng_psf/psx_hw.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psx_hw.lo -MD -MP -MF $(DEPDIR)/psx_hw.Tpo -c -o psx_hw.lo `test -f 'eng_psf/psx_hw.c' || echo '$(srcdir)/'`eng_psf/psx_hw.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/psx_hw.Tpo $(DEPDIR)/psx_hw.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_psf/psx_hw.c' object='psx_hw.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psx_hw.lo -MD -MP -MF $(DEPDIR)/psx_hw.Tpo -c -o psx_hw.lo `test -f 'eng_psf/psx_hw.c' || echo '$(srcdir)/'`eng_psf/psx_hw.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/psx_hw.Tpo $(DEPDIR)/psx_hw.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_psf/psx_hw.c' object='psx_hw.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psx_hw.lo `test -f 'eng_psf/psx_hw.c' || echo '$(srcdir)/'`eng_psf/psx_hw.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psx_hw.lo `test -f 'eng_psf/psx_hw.c' || echo '$(srcdir)/'`eng_psf/psx_hw.c
spu.lo: eng_psf/peops/spu.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu.lo -MD -MP -MF $(DEPDIR)/spu.Tpo -c -o spu.lo `test -f 'eng_psf/peops/spu.c' || echo '$(srcdir)/'`eng_psf/peops/spu.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_psf/peops/spu.c' object='spu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu.lo -MD -MP -MF $(DEPDIR)/spu.Tpo -c -o spu.lo `test -f 'eng_psf/peops/spu.c' || echo '$(srcdir)/'`eng_psf/peops/spu.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_psf/peops/spu.c' object='spu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu.lo `test -f 'eng_psf/peops/spu.c' || echo '$(srcdir)/'`eng_psf/peops/spu.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu.lo `test -f 'eng_psf/peops/spu.c' || echo '$(srcdir)/'`eng_psf/peops/spu.c
eng_psf2.lo: eng_psf/eng_psf2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_psf2.lo -MD -MP -MF $(DEPDIR)/eng_psf2.Tpo -c -o eng_psf2.lo `test -f 'eng_psf/eng_psf2.c' || echo '$(srcdir)/'`eng_psf/eng_psf2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/eng_psf2.Tpo $(DEPDIR)/eng_psf2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_psf/eng_psf2.c' object='eng_psf2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_psf2.lo -MD -MP -MF $(DEPDIR)/eng_psf2.Tpo -c -o eng_psf2.lo `test -f 'eng_psf/eng_psf2.c' || echo '$(srcdir)/'`eng_psf/eng_psf2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eng_psf2.Tpo $(DEPDIR)/eng_psf2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_psf/eng_psf2.c' object='eng_psf2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_psf2.lo `test -f 'eng_psf/eng_psf2.c' || echo '$(srcdir)/'`eng_psf/eng_psf2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_psf2.lo `test -f 'eng_psf/eng_psf2.c' || echo '$(srcdir)/'`eng_psf/eng_psf2.c
spu2.lo: eng_psf/peops2/spu2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu2.lo -MD -MP -MF $(DEPDIR)/spu2.Tpo -c -o spu2.lo `test -f 'eng_psf/peops2/spu2.c' || echo '$(srcdir)/'`eng_psf/peops2/spu2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/spu2.Tpo $(DEPDIR)/spu2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_psf/peops2/spu2.c' object='spu2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu2.lo -MD -MP -MF $(DEPDIR)/spu2.Tpo -c -o spu2.lo `test -f 'eng_psf/peops2/spu2.c' || echo '$(srcdir)/'`eng_psf/peops2/spu2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/spu2.Tpo $(DEPDIR)/spu2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_psf/peops2/spu2.c' object='spu2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu2.lo `test -f 'eng_psf/peops2/spu2.c' || echo '$(srcdir)/'`eng_psf/peops2/spu2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu2.lo `test -f 'eng_psf/peops2/spu2.c' || echo '$(srcdir)/'`eng_psf/peops2/spu2.c
dma2.lo: eng_psf/peops2/dma2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dma2.lo -MD -MP -MF $(DEPDIR)/dma2.Tpo -c -o dma2.lo `test -f 'eng_psf/peops2/dma2.c' || echo '$(srcdir)/'`eng_psf/peops2/dma2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/dma2.Tpo $(DEPDIR)/dma2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_psf/peops2/dma2.c' object='dma2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dma2.lo -MD -MP -MF $(DEPDIR)/dma2.Tpo -c -o dma2.lo `test -f 'eng_psf/peops2/dma2.c' || echo '$(srcdir)/'`eng_psf/peops2/dma2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dma2.Tpo $(DEPDIR)/dma2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_psf/peops2/dma2.c' object='dma2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dma2.lo `test -f 'eng_psf/peops2/dma2.c' || echo '$(srcdir)/'`eng_psf/peops2/dma2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dma2.lo `test -f 'eng_psf/peops2/dma2.c' || echo '$(srcdir)/'`eng_psf/peops2/dma2.c
registers2.lo: eng_psf/peops2/registers2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT registers2.lo -MD -MP -MF $(DEPDIR)/registers2.Tpo -c -o registers2.lo `test -f 'eng_psf/peops2/registers2.c' || echo '$(srcdir)/'`eng_psf/peops2/registers2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/registers2.Tpo $(DEPDIR)/registers2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_psf/peops2/registers2.c' object='registers2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT registers2.lo -MD -MP -MF $(DEPDIR)/registers2.Tpo -c -o registers2.lo `test -f 'eng_psf/peops2/registers2.c' || echo '$(srcdir)/'`eng_psf/peops2/registers2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/registers2.Tpo $(DEPDIR)/registers2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_psf/peops2/registers2.c' object='registers2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o registers2.lo `test -f 'eng_psf/peops2/registers2.c' || echo '$(srcdir)/'`eng_psf/peops2/registers2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o registers2.lo `test -f 'eng_psf/peops2/registers2.c' || echo '$(srcdir)/'`eng_psf/peops2/registers2.c
eng_spu.lo: eng_psf/eng_spu.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_spu.lo -MD -MP -MF $(DEPDIR)/eng_spu.Tpo -c -o eng_spu.lo `test -f 'eng_psf/eng_spu.c' || echo '$(srcdir)/'`eng_psf/eng_spu.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/eng_spu.Tpo $(DEPDIR)/eng_spu.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eng_psf/eng_spu.c' object='eng_spu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_spu.lo -MD -MP -MF $(DEPDIR)/eng_spu.Tpo -c -o eng_spu.lo `test -f 'eng_psf/eng_spu.c' || echo '$(srcdir)/'`eng_psf/eng_spu.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eng_spu.Tpo $(DEPDIR)/eng_spu.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eng_psf/eng_spu.c' object='eng_spu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_spu.lo `test -f 'eng_psf/eng_spu.c' || echo '$(srcdir)/'`eng_psf/eng_spu.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_spu.lo `test -f 'eng_psf/eng_spu.c' || echo '$(srcdir)/'`eng_psf/eng_spu.c
mostlyclean-libtool:
-rm -f *.lo
@@@ -771,26 -858,15 +885,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -802,15 -878,11 +905,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -819,6 -891,21 +918,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -963,19 -1050,20 +1077,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/artwork/Makefile.in
index 3a4fbab,ea90a99..9d607bc
--- a/plugins/artwork/Makefile.in
+++ b/plugins/artwork/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/artwork
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -117,30 -145,60 +169,60 @@@ am__DEPENDENCIES_1
@HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_TRUE@ $(am__DEPENDENCIES_1)
@HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE at am__DEPENDENCIES_3 = \
@HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE@ $(am__DEPENDENCIES_1)
+ @HAVE_ARTWORK_TRUE@@HAVE_OGG_TRUE at am__DEPENDENCIES_4 = \
+ @HAVE_ARTWORK_TRUE@@HAVE_OGG_TRUE@ $(am__DEPENDENCIES_1)
@HAVE_ARTWORK_TRUE at artwork_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
- @HAVE_ARTWORK_TRUE@ $(am__DEPENDENCIES_3)
+ @HAVE_ARTWORK_TRUE@ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4)
am__artwork_la_SOURCES_DIST = artwork.c artwork.h albumartorg.c \
albumartorg.h lastfm.c lastfm.h wos.c wos.h escape.c escape.h
- @HAVE_ARTWORK_TRUE at am_artwork_la_OBJECTS = artwork.lo albumartorg.lo \
- @HAVE_ARTWORK_TRUE@ lastfm.lo wos.lo escape.lo
+ @ARTWORK_USE_VFS_CURL_TRUE@@HAVE_ARTWORK_TRUE at am__objects_1 = \
+ @ARTWORK_USE_VFS_CURL_TRUE@@HAVE_ARTWORK_TRUE@ albumartorg.lo \
+ @ARTWORK_USE_VFS_CURL_TRUE@@HAVE_ARTWORK_TRUE@ lastfm.lo wos.lo \
+ @ARTWORK_USE_VFS_CURL_TRUE@@HAVE_ARTWORK_TRUE@ escape.lo
+ @HAVE_ARTWORK_TRUE at am_artwork_la_OBJECTS = artwork.lo $(am__objects_1)
artwork_la_OBJECTS = $(am_artwork_la_OBJECTS)
- artwork_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ artwork_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(artwork_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_ARTWORK_TRUE at am_artwork_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(artwork_la_SOURCES)
DIST_SOURCES = $(am__artwork_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -148,6 -206,23 +230,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -174,6 -249,7 +276,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -194,10 -270,12 +297,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -220,6 -298,7 +325,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -273,6 -352,7 +379,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -291,6 -371,8 +398,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -316,13 -398,17 +425,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -331,7 -417,9 +444,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -391,16 -479,20 +506,20 @@@ top_builddir = @top_builddir
top_srcdir = @top_srcdir@
@HAVE_ARTWORK_TRUE at artworkdir = $(libdir)/$(PACKAGE)
@HAVE_ARTWORK_TRUE at pkglib_LTLIBRARIES = artwork.la
- @HAVE_ARTWORK_TRUE at artwork_la_SOURCES = artwork.c artwork.h albumartorg.c albumartorg.h lastfm.c lastfm.h wos.c wos.h escape.c escape.h
- @HAVE_ARTWORK_TRUE at artwork_la_LDFLAGS = -module
+ @HAVE_ARTWORK_TRUE@@HAVE_OGG_TRUE at ogg_def = -DUSE_OGG=1
+ @HAVE_ARTWORK_TRUE@@HAVE_OGG_TRUE at ogg_libs = $(OGG_LIBS)
+ @ARTWORK_USE_VFS_CURL_TRUE@@HAVE_ARTWORK_TRUE at artwork_net_cflags = -DUSE_VFS_CURL
+ @ARTWORK_USE_VFS_CURL_TRUE@@HAVE_ARTWORK_TRUE at artwork_net_sources = albumartorg.c albumartorg.h lastfm.c lastfm.h wos.c wos.h escape.c escape.h
+ @HAVE_ARTWORK_TRUE at artwork_la_SOURCES = artwork.c artwork.h $(artwork_net_sources)
+ @HAVE_ARTWORK_TRUE at artwork_la_LDFLAGS = -module -avoid-version
@HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_FALSE at ARTWORK_DEPS = $(JPEG_DEPS_LIBS) $(PNG_DEPS_LIBS)
@HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_TRUE at ARTWORK_DEPS = $(IMLIB2_DEPS_LIBS)
@HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_FALSE at ARTWORK_CFLAGS = $(JPEG_DEPS_CFLAGS) $(PNG_DEPS_CFLAGS)
@HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_TRUE at ARTWORK_CFLAGS = -DUSE_IMLIB2
@HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE at FLAC_DEPS = $(FLAC_LIBS)
- @HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE at FLAC_CFLAGS = -DUSE_METAFLAC
- @HAVE_ARTWORK_TRUE at AM_CFLAGS = $(CFLAGS) $(ARTWORK_CFLAGS) $(FLAC_CFLAGS) -std=c99
- @HAVE_ARTWORK_TRUE at artwork_la_LIBADD = $(LDADD) $(ARTWORK_DEPS) $(FLAC_DEPS)
+ @HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE at flac_cflags = -DUSE_METAFLAC $(FLAC_CFLAGS)
+ @HAVE_ARTWORK_TRUE at AM_CFLAGS = $(CFLAGS) $(ARTWORK_CFLAGS) $(flac_cflags) $(artwork_net_cflags) $(ogg_def) -std=c99
+ @HAVE_ARTWORK_TRUE at artwork_la_LIBADD = $(LDADD) $(ARTWORK_DEPS) $(FLAC_DEPS) $(ogg_libs)
all: all-am
.SUFFIXES:
@@@ -435,6 -527,7 +554,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -461,14 -554,17 +581,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
artwork.la: $(artwork_la_OBJECTS) $(artwork_la_DEPENDENCIES) $(EXTRA_artwork_la_DEPENDENCIES)
- $(artwork_la_LINK) $(am_artwork_la_rpath) $(artwork_la_OBJECTS) $(artwork_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(artwork_la_LINK) $(am_artwork_la_rpath) $(artwork_la_OBJECTS) $(artwork_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -483,25 -579,25 +606,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wos.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -509,26 -605,15 +632,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -540,15 -625,11 +652,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -557,6 -638,21 +665,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -701,19 -797,20 +824,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/cdda/Makefile.in
index 8e804af,4a8972d..0f08d34
--- a/plugins/cdda/Makefile.in
+++ b/plugins/cdda/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/cdda
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -114,23 -142,48 +166,48 @@@ am__DEPENDENCIES_1
am__cdda_la_SOURCES_DIST = cdda.c
@HAVE_CDDA_TRUE at am_cdda_la_OBJECTS = cdda.lo
cdda_la_OBJECTS = $(am_cdda_la_OBJECTS)
- cdda_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(cdda_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ cdda_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(cdda_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_CDDA_TRUE at am_cdda_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(cdda_la_SOURCES)
DIST_SOURCES = $(am__cdda_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -191,23 +215,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -234,7 +261,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -255,12 +282,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -283,7 +310,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -337,7 +364,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -356,8 +383,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -383,17 +410,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -402,9 +429,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,7 -465,7 +492,7 @@@ top_srcdir = @top_srcdir
@HAVE_CDDA_TRUE at cddadir = $(libdir)/$(PACKAGE)
@HAVE_CDDA_TRUE at pkglib_LTLIBRARIES = cdda.la
@HAVE_CDDA_TRUE at cdda_la_SOURCES = cdda.c
- @HAVE_CDDA_TRUE at cdda_la_LDFLAGS = -module
+ @HAVE_CDDA_TRUE at cdda_la_LDFLAGS = -module -avoid-version
@HAVE_CDDA_TRUE at cdda_la_LIBADD = $(LDADD) $(CDDA_LIBS)
@HAVE_CDDA_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 $(CDDA_CFLAGS)
all: all-am
@@@ -419,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
cdda.la: $(cdda_la_OBJECTS) $(cdda_la_DEPENDENCIES) $(EXTRA_cdda_la_DEPENDENCIES)
- $(cdda_la_LINK) $(am_cdda_la_rpath) $(cdda_la_OBJECTS) $(cdda_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(cdda_la_LINK) $(am_cdda_la_rpath) $(cdda_la_OBJECTS) $(cdda_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cdda.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/converter/Makefile.in
index 1c0eeb6,f5d7bbb..6ce9f05
--- a/plugins/converter/Makefile.in
+++ b/plugins/converter/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -17,23 -16,51 +20,71 @@@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -53,7 -80,8 +104,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/converter
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -114,7 -142,11 +166,11 @@@ converter_la_LIBADD
am__converter_la_SOURCES_DIST = converter.c converter.h
@HAVE_CONVERTER_TRUE at am_converter_la_OBJECTS = converter.lo
converter_la_OBJECTS = $(am_converter_la_OBJECTS)
- converter_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ converter_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(converter_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE at am_converter_la_rpath = \
@@@ -128,25 -160,14 +184,14 @@@
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@ $(pkglibdir)
am__DEPENDENCIES_1 =
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_FALSE at converter_gtk2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE at converter_gtk2_la_DEPENDENCIES = $(GTK_ROOT)/lib/libgtk-x11-2.0.la \
- @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgdk-x11-2.0.la \
- @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libpangoft2-1.0.la \
- @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libpangocairo-1.0.la \
- @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la \
- @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libcairo.la \
- @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libpango-1.0.la \
- @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgobject-2.0.la \
- @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgmodule-2.0.la \
- @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgthread-2.0.la \
- @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libglib-2.0.la
am__converter_gtk2_la_SOURCES_DIST = convgui.c interface.c support.c \
callbacks.h converter.h interface.h support.h
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE at am_converter_gtk2_la_OBJECTS = converter_gtk2_la-convgui.lo \
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@ converter_gtk2_la-interface.lo \
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@ converter_gtk2_la-support.lo
converter_gtk2_la_OBJECTS = $(am_converter_gtk2_la_OBJECTS)
- converter_gtk2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ converter_gtk2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(converter_gtk2_la_CFLAGS) $(CFLAGS) \
$(converter_gtk2_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE at am_converter_gtk2_la_rpath = \
@@@ -155,15 -176,16 +200,16 @@@
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE at am_converter_gtk2_la_rpath = \
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@ -rpath \
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@ $(pkglibdir)
- @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE at converter_gtk3_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at converter_gtk3_la_DEPENDENCIES = \
+ @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@ $(am__DEPENDENCIES_1)
am__converter_gtk3_la_SOURCES_DIST = convgui.c interface.c support.c \
callbacks.h converter.h interface.h support.h
@HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at am_converter_gtk3_la_OBJECTS = converter_gtk3_la-convgui.lo \
@HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@ converter_gtk3_la-interface.lo \
@HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@ converter_gtk3_la-support.lo
converter_gtk3_la_OBJECTS = $(am_converter_gtk3_la_OBJECTS)
- converter_gtk3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ converter_gtk3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(converter_gtk3_la_CFLAGS) $(CFLAGS) \
$(converter_gtk3_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE at am_converter_gtk3_la_rpath = \
@@@ -172,19 -194,40 +218,40 @@@
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE at am_converter_gtk3_la_rpath = \
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@ -rpath \
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@ $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(converter_la_SOURCES) $(converter_gtk2_la_SOURCES) \
$(converter_gtk3_la_SOURCES)
DIST_SOURCES = $(am__converter_la_SOURCES_DIST) \
@@@ -196,6 -239,23 +263,23 @@@ am__can_run_installinfo =
*) (install-info --version) >/dev/null 2>&1;; \
esac
DATA = $(convdata_DATA)
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -222,6 -282,7 +306,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -242,10 -303,12 +327,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -268,6 -331,7 +355,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -321,6 -385,7 +409,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -339,6 -404,8 +428,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -364,13 -431,17 +455,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -379,7 -450,9 +474,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -448,28 -521,28 +545,28 @@@ top_srcdir = @top_srcdir
@HAVE_CONVERTER_TRUE@ presets/MP3_VBR_192Kbps_(Lame).txt\
@HAVE_CONVERTER_TRUE@ presets/MS_RIFF_WAV.txt\
@HAVE_CONVERTER_TRUE@ presets/MusePack.txt\
+ @HAVE_CONVERTER_TRUE@ presets/Ogg_FLAC.txt\
@HAVE_CONVERTER_TRUE@ presets/Ogg_Vorbis_(-q_5).txt\
+ @HAVE_CONVERTER_TRUE@ presets/Opus.txt\
@HAVE_CONVERTER_TRUE@ presets/TTA.txt\
- @HAVE_CONVERTER_TRUE@ presets/WavPack.txt
+ @HAVE_CONVERTER_TRUE@ presets/WavPack.txt\
+ @HAVE_CONVERTER_TRUE@ presets/ALAC.txt
@HAVE_CONVERTER_TRUE at EXTRA_DIST = $(convdata_DATA) converter.glade
@HAVE_CONVERTER_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
@HAVE_CONVERTER_TRUE at converter_la_SOURCES = converter.c converter.h
- @HAVE_CONVERTER_TRUE at converter_la_LDFLAGS = -module
+ @HAVE_CONVERTER_TRUE at converter_la_LDFLAGS = -module -avoid-version
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE at converter_gtk2_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
- @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE at converter_gtk2_la_LDFLAGS = -module
+ @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE at converter_gtk2_la_LDFLAGS = -module -avoid-version
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE at GTK_ROOT = @top_srcdir@/$(LIB)/gtk-2.12.12/usr
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_FALSE at converter_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
- @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE at converter_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
+ @HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE at converter_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lrt
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_FALSE at converter_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_TRUE at converter_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
@HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at converter_gtk3_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
- @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at converter_gtk3_la_LDFLAGS = -module
- @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at GTK_ROOT_300 = @top_srcdir@/$(LIB)/gtk-3.0.0
- @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE at converter_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
- @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at converter_gtk3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD)
- @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE at converter_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
- @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at converter_gtk3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS)
+ @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at converter_gtk3_la_LDFLAGS = -module -avoid-version
+ @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at converter_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
+ @HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE at converter_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
all: all-am
.SUFFIXES:
@@@ -504,6 -577,7 +601,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -530,18 -604,23 +628,23 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
converter.la: $(converter_la_OBJECTS) $(converter_la_DEPENDENCIES) $(EXTRA_converter_la_DEPENDENCIES)
- $(converter_la_LINK) $(am_converter_la_rpath) $(converter_la_OBJECTS) $(converter_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(converter_la_LINK) $(am_converter_la_rpath) $(converter_la_OBJECTS) $(converter_la_LIBADD) $(LIBS)
+
converter_gtk2.la: $(converter_gtk2_la_OBJECTS) $(converter_gtk2_la_DEPENDENCIES) $(EXTRA_converter_gtk2_la_DEPENDENCIES)
- $(converter_gtk2_la_LINK) $(am_converter_gtk2_la_rpath) $(converter_gtk2_la_OBJECTS) $(converter_gtk2_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(converter_gtk2_la_LINK) $(am_converter_gtk2_la_rpath) $(converter_gtk2_la_OBJECTS) $(converter_gtk2_la_LIBADD) $(LIBS)
+
converter_gtk3.la: $(converter_gtk3_la_OBJECTS) $(converter_gtk3_la_DEPENDENCIES) $(EXTRA_converter_gtk3_la_DEPENDENCIES)
- $(converter_gtk3_la_LINK) $(am_converter_gtk3_la_rpath) $(converter_gtk3_la_OBJECTS) $(converter_gtk3_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(converter_gtk3_la_LINK) $(am_converter_gtk3_la_rpath) $(converter_gtk3_la_OBJECTS) $(converter_gtk3_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -558,67 -637,67 +661,67 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/converter_gtk3_la-support.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
converter_gtk2_la-convgui.lo: convgui.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-convgui.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-convgui.Tpo -c -o converter_gtk2_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/converter_gtk2_la-convgui.Tpo $(DEPDIR)/converter_gtk2_la-convgui.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='convgui.c' object='converter_gtk2_la-convgui.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-convgui.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-convgui.Tpo -c -o converter_gtk2_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk2_la-convgui.Tpo $(DEPDIR)/converter_gtk2_la-convgui.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='convgui.c' object='converter_gtk2_la-convgui.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
converter_gtk2_la-interface.lo: interface.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-interface.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-interface.Tpo -c -o converter_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/converter_gtk2_la-interface.Tpo $(DEPDIR)/converter_gtk2_la-interface.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='interface.c' object='converter_gtk2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-interface.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-interface.Tpo -c -o converter_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk2_la-interface.Tpo $(DEPDIR)/converter_gtk2_la-interface.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='interface.c' object='converter_gtk2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
converter_gtk2_la-support.lo: support.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-support.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-support.Tpo -c -o converter_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/converter_gtk2_la-support.Tpo $(DEPDIR)/converter_gtk2_la-support.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='support.c' object='converter_gtk2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-support.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-support.Tpo -c -o converter_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk2_la-support.Tpo $(DEPDIR)/converter_gtk2_la-support.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='support.c' object='converter_gtk2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
converter_gtk3_la-convgui.lo: convgui.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-convgui.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-convgui.Tpo -c -o converter_gtk3_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/converter_gtk3_la-convgui.Tpo $(DEPDIR)/converter_gtk3_la-convgui.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='convgui.c' object='converter_gtk3_la-convgui.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-convgui.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-convgui.Tpo -c -o converter_gtk3_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk3_la-convgui.Tpo $(DEPDIR)/converter_gtk3_la-convgui.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='convgui.c' object='converter_gtk3_la-convgui.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
converter_gtk3_la-interface.lo: interface.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-interface.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-interface.Tpo -c -o converter_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/converter_gtk3_la-interface.Tpo $(DEPDIR)/converter_gtk3_la-interface.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='interface.c' object='converter_gtk3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-interface.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-interface.Tpo -c -o converter_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk3_la-interface.Tpo $(DEPDIR)/converter_gtk3_la-interface.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='interface.c' object='converter_gtk3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
converter_gtk3_la-support.lo: support.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-support.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-support.Tpo -c -o converter_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/converter_gtk3_la-support.Tpo $(DEPDIR)/converter_gtk3_la-support.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='support.c' object='converter_gtk3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-support.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-support.Tpo -c -o converter_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk3_la-support.Tpo $(DEPDIR)/converter_gtk3_la-support.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='support.c' object='converter_gtk3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
mostlyclean-libtool:
-rm -f *.lo
@@@ -647,26 -726,15 +750,15 @@@ uninstall-convdataDATA
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(convdatadir)'; $(am__uninstall_files_from_dir)
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -678,15 -746,11 +770,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -695,6 -759,21 +783,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -839,20 -918,21 +942,21 @@@ uninstall-am: uninstall-convdataDATA un
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-convdataDATA install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-pkglibLTLIBRARIES install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-convdataDATA uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-convdataDATA \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-pkglibLTLIBRARIES install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-convdataDATA \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/coreaudio/Makefile.in
index 296cbc9,b42fb61..9ee10c1
--- a/plugins/coreaudio/Makefile.in
+++ b/plugins/coreaudio/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/coreaudio
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -115,23 -143,48 +167,48 @@@ am__DEPENDENCIES_1
am__coreaudio_la_SOURCES_DIST = coreaudio.c
@HAVE_COREAUDIO_TRUE at am_coreaudio_la_OBJECTS = coreaudio.lo
coreaudio_la_OBJECTS = $(am_coreaudio_la_OBJECTS)
- coreaudio_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ coreaudio_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(coreaudio_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_COREAUDIO_TRUE at am_coreaudio_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(coreaudio_la_SOURCES)
DIST_SOURCES = $(am__coreaudio_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -139,6 -192,23 +216,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -165,6 -235,7 +262,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -185,10 -256,12 +283,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -211,6 -284,7 +311,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -264,6 -338,7 +365,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -282,6 -357,8 +384,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -307,13 -384,17 +411,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -322,7 -403,9 +430,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,7 -465,7 +492,7 @@@ top_builddir = @top_builddir
top_srcdir = @top_srcdir@
@HAVE_COREAUDIO_TRUE at pkglib_LTLIBRARIES = coreaudio.la
@HAVE_COREAUDIO_TRUE at coreaudio_la_SOURCES = coreaudio.c
- @HAVE_COREAUDIO_TRUE at coreaudio_la_LDFLAGS = -module
+ @HAVE_COREAUDIO_TRUE at coreaudio_la_LDFLAGS = -module -avoid-version
@HAVE_COREAUDIO_TRUE at coreaudio_la_LIBADD = $(LDADD) $(COREAUDIO_LIBS)
@HAVE_COREAUDIO_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 $(COREAUDIO_CFLAGS)
all: all-am
@@@ -419,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
coreaudio.la: $(coreaudio_la_OBJECTS) $(coreaudio_la_DEPENDENCIES) $(EXTRA_coreaudio_la_DEPENDENCIES)
- $(coreaudio_la_LINK) $(am_coreaudio_la_rpath) $(coreaudio_la_OBJECTS) $(coreaudio_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(coreaudio_la_LINK) $(am_coreaudio_la_rpath) $(coreaudio_la_OBJECTS) $(coreaudio_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/coreaudio.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/dca/Makefile.in
index 867c790,5b50ac4..a50d9d7
--- a/plugins/dca/Makefile.in
+++ b/plugins/dca/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,8 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/dca
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- AUTHORS COPYING
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp AUTHORS COPYING README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -120,23 -147,48 +171,48 @@@ am__dca_la_SOURCES_DIST = dcaplug.c ext
@HAVE_DCA_TRUE@ gettimeofday.lo parse.lo bitstream.lo \
@HAVE_DCA_TRUE@ downmix.lo
dca_la_OBJECTS = $(am_dca_la_OBJECTS)
- dca_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(dca_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ dca_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(dca_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_DCA_TRUE at am_dca_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(dca_la_SOURCES)
DIST_SOURCES = $(am__dca_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -144,6 -196,23 +220,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -170,6 -239,7 +266,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -190,10 -260,12 +287,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -216,6 -288,7 +315,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -269,6 -342,7 +369,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -287,6 -361,8 +388,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -312,13 -388,17 +415,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -327,7 -407,9 +434,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -406,7 -488,7 +515,7 @@@ top_srcdir = @top_srcdir
@HAVE_DCA_TRUE at tables_vq.h\
@HAVE_DCA_TRUE at bitstream.h
- @HAVE_DCA_TRUE at dca_la_LDFLAGS = -module
+ @HAVE_DCA_TRUE at dca_la_LDFLAGS = -module -avoid-version
@HAVE_DCA_TRUE at dca_la_LIBADD = $(LDADD) -lm
@HAVE_DCA_TRUE at AM_CFLAGS = $(CFLAGS) -fPIC -std=c99
all: all-am
@@@ -443,6 -525,7 +552,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -469,14 -552,17 +579,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
dca.la: $(dca_la_OBJECTS) $(dca_la_DEPENDENCIES) $(EXTRA_dca_la_DEPENDENCIES)
- $(dca_la_LINK) $(am_dca_la_rpath) $(dca_la_OBJECTS) $(dca_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(dca_la_LINK) $(am_dca_la_rpath) $(dca_la_OBJECTS) $(dca_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -492,25 -578,25 +605,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parse.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -518,26 -604,15 +631,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -549,15 -624,11 +651,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -566,6 -637,21 +664,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -710,19 -796,20 +823,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/dsp_libsrc/Makefile.in
index 23ddfaa,c6fa679..292c23e
--- a/plugins/dsp_libsrc/Makefile.in
+++ b/plugins/dsp_libsrc/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/dsp_libsrc
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -114,23 -142,48 +166,48 @@@ am__DEPENDENCIES_1
am__dsp_libsrc_la_SOURCES_DIST = src.c src.h
@HAVE_DSP_SRC_TRUE at am_dsp_libsrc_la_OBJECTS = dsp_libsrc_la-src.lo
dsp_libsrc_la_OBJECTS = $(am_dsp_libsrc_la_OBJECTS)
- dsp_libsrc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ dsp_libsrc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(dsp_libsrc_la_CFLAGS) \
$(CFLAGS) $(dsp_libsrc_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_DSP_SRC_TRUE at am_dsp_libsrc_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(dsp_libsrc_la_SOURCES)
DIST_SOURCES = $(am__dsp_libsrc_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -191,23 +215,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -234,7 +261,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -255,12 +282,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -283,7 +310,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -337,7 +364,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -356,8 +383,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -383,17 +410,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -402,9 +429,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -381,7 -464,7 +491,7 @@@ top_builddir = @top_builddir
top_srcdir = @top_srcdir@
@HAVE_DSP_SRC_TRUE at pkglib_LTLIBRARIES = dsp_libsrc.la
@HAVE_DSP_SRC_TRUE at dsp_libsrc_la_SOURCES = src.c src.h
- @HAVE_DSP_SRC_TRUE at dsp_libsrc_la_LDFLAGS = -module
+ @HAVE_DSP_SRC_TRUE at dsp_libsrc_la_LDFLAGS = -module -avoid-version
@HAVE_DSP_SRC_TRUE at dsp_libsrc_la_LIBADD = $(LIBADD) $(LIBSAMPLERATE_DEPS_LIBS)
@HAVE_DSP_SRC_TRUE at dsp_libsrc_la_CFLAGS = $(CFLAGS) $(LIBSAMPLERATE_DEPS_CFLAGS) -std=c99
all: all-am
@@@ -418,6 -501,7 +528,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -444,14 -528,17 +555,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
dsp_libsrc.la: $(dsp_libsrc_la_OBJECTS) $(dsp_libsrc_la_DEPENDENCIES) $(EXTRA_dsp_libsrc_la_DEPENDENCIES)
- $(dsp_libsrc_la_LINK) $(am_dsp_libsrc_la_rpath) $(dsp_libsrc_la_OBJECTS) $(dsp_libsrc_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(dsp_libsrc_la_LINK) $(am_dsp_libsrc_la_rpath) $(dsp_libsrc_la_OBJECTS) $(dsp_libsrc_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -462,32 -549,32 +576,32 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dsp_libsrc_la-src.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
dsp_libsrc_la-src.lo: src.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dsp_libsrc_la_CFLAGS) $(CFLAGS) -MT dsp_libsrc_la-src.lo -MD -MP -MF $(DEPDIR)/dsp_libsrc_la-src.Tpo -c -o dsp_libsrc_la-src.lo `test -f 'src.c' || echo '$(srcdir)/'`src.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/dsp_libsrc_la-src.Tpo $(DEPDIR)/dsp_libsrc_la-src.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src.c' object='dsp_libsrc_la-src.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dsp_libsrc_la_CFLAGS) $(CFLAGS) -MT dsp_libsrc_la-src.lo -MD -MP -MF $(DEPDIR)/dsp_libsrc_la-src.Tpo -c -o dsp_libsrc_la-src.lo `test -f 'src.c' || echo '$(srcdir)/'`src.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dsp_libsrc_la-src.Tpo $(DEPDIR)/dsp_libsrc_la-src.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src.c' object='dsp_libsrc_la-src.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dsp_libsrc_la_CFLAGS) $(CFLAGS) -c -o dsp_libsrc_la-src.lo `test -f 'src.c' || echo '$(srcdir)/'`src.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dsp_libsrc_la_CFLAGS) $(CFLAGS) -c -o dsp_libsrc_la-src.lo `test -f 'src.c' || echo '$(srcdir)/'`src.c
mostlyclean-libtool:
-rm -f *.lo
@@@ -495,26 -582,15 +609,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -526,15 -602,11 +629,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -543,6 -615,21 +642,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -687,19 -774,20 +801,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/dumb/Makefile.in
index d795780,758d93d..68a305f
--- a/plugins/dumb/Makefile.in
+++ b/plugins/dumb/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/dumb
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -190,23 -218,48 +242,48 @@@ am__ddb_dumb_la_SOURCES_DIST = dumb-kod
@HAVE_DUMB_TRUE@ silence.lo stdfile.lo resample.lo riff.lo \
@HAVE_DUMB_TRUE@ memfile.lo sampbuf.lo barray.lo cdumb.lo
ddb_dumb_la_OBJECTS = $(am_ddb_dumb_la_OBJECTS)
- ddb_dumb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ ddb_dumb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(ddb_dumb_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_DUMB_TRUE at am_ddb_dumb_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(ddb_dumb_la_SOURCES)
DIST_SOURCES = $(am__ddb_dumb_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -214,6 -267,23 +291,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -240,6 -310,7 +337,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -260,10 -331,12 +358,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -286,6 -359,7 +386,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -339,6 -413,7 +440,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -357,6 -432,8 +459,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -382,13 -459,17 +486,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -397,7 -478,9 +505,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -459,7 -542,7 +569,7 @@@ top_srcdir = @top_srcdir
@HAVE_DUMB_TRUE at EXTRA_DIST = $(dumbpath)/readme.txt $(dumbpath)/ChangeLog $(dumbpath)/licence.txt $(dumbpath)/release.txt $(dumbpath)/todo.txt
@HAVE_DUMB_TRUE at pkglib_LTLIBRARIES = ddb_dumb.la
@HAVE_DUMB_TRUE at AM_CFLAGS = $(CFLAGS) -I$(dumbpath)/include -std=c99
- @HAVE_DUMB_TRUE at ddb_dumb_la_LDFLAGS = -module -lm
+ @HAVE_DUMB_TRUE at ddb_dumb_la_LDFLAGS = -module -avoid-version -lm
@HAVE_DUMB_TRUE at ddb_dumb_la_SOURCES = \
@HAVE_DUMB_TRUE at dumb-kode54/src/it/readam.c\
@HAVE_DUMB_TRUE at dumb-kode54/src/it/readstm.c\
@@@ -591,6 -674,7 +701,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -617,14 -701,17 +728,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
ddb_dumb.la: $(ddb_dumb_la_OBJECTS) $(ddb_dumb_la_DEPENDENCIES) $(EXTRA_ddb_dumb_la_DEPENDENCIES)
- $(ddb_dumb_la_LINK) $(am_ddb_dumb_la_rpath) $(ddb_dumb_la_OBJECTS) $(ddb_dumb_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(ddb_dumb_la_LINK) $(am_ddb_dumb_la_rpath) $(ddb_dumb_la_OBJECTS) $(ddb_dumb_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -705,515 -792,515 +819,515 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmeffect.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
readam.lo: dumb-kode54/src/it/readam.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readam.lo -MD -MP -MF $(DEPDIR)/readam.Tpo -c -o readam.lo `test -f 'dumb-kode54/src/it/readam.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readam.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readam.Tpo $(DEPDIR)/readam.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readam.c' object='readam.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readam.lo -MD -MP -MF $(DEPDIR)/readam.Tpo -c -o readam.lo `test -f 'dumb-kode54/src/it/readam.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readam.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readam.Tpo $(DEPDIR)/readam.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readam.c' object='readam.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readam.lo `test -f 'dumb-kode54/src/it/readam.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readam.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readam.lo `test -f 'dumb-kode54/src/it/readam.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readam.c
readstm.lo: dumb-kode54/src/it/readstm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readstm.lo -MD -MP -MF $(DEPDIR)/readstm.Tpo -c -o readstm.lo `test -f 'dumb-kode54/src/it/readstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readstm.Tpo $(DEPDIR)/readstm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readstm.c' object='readstm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readstm.lo -MD -MP -MF $(DEPDIR)/readstm.Tpo -c -o readstm.lo `test -f 'dumb-kode54/src/it/readstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readstm.Tpo $(DEPDIR)/readstm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readstm.c' object='readstm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readstm.lo `test -f 'dumb-kode54/src/it/readstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readstm.lo `test -f 'dumb-kode54/src/it/readstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm.c
loads3m.lo: dumb-kode54/src/it/loads3m.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loads3m.lo -MD -MP -MF $(DEPDIR)/loads3m.Tpo -c -o loads3m.lo `test -f 'dumb-kode54/src/it/loads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loads3m.Tpo $(DEPDIR)/loads3m.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loads3m.c' object='loads3m.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loads3m.lo -MD -MP -MF $(DEPDIR)/loads3m.Tpo -c -o loads3m.lo `test -f 'dumb-kode54/src/it/loads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loads3m.Tpo $(DEPDIR)/loads3m.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loads3m.c' object='loads3m.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loads3m.lo `test -f 'dumb-kode54/src/it/loads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loads3m.lo `test -f 'dumb-kode54/src/it/loads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m.c
loadxm.lo: dumb-kode54/src/it/loadxm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadxm.lo -MD -MP -MF $(DEPDIR)/loadxm.Tpo -c -o loadxm.lo `test -f 'dumb-kode54/src/it/loadxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadxm.Tpo $(DEPDIR)/loadxm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadxm.c' object='loadxm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadxm.lo -MD -MP -MF $(DEPDIR)/loadxm.Tpo -c -o loadxm.lo `test -f 'dumb-kode54/src/it/loadxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadxm.Tpo $(DEPDIR)/loadxm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadxm.c' object='loadxm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadxm.lo `test -f 'dumb-kode54/src/it/loadxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadxm.lo `test -f 'dumb-kode54/src/it/loadxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm.c
ptmeffect.lo: dumb-kode54/src/it/ptmeffect.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptmeffect.lo -MD -MP -MF $(DEPDIR)/ptmeffect.Tpo -c -o ptmeffect.lo `test -f 'dumb-kode54/src/it/ptmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/ptmeffect.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptmeffect.Tpo $(DEPDIR)/ptmeffect.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/ptmeffect.c' object='ptmeffect.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptmeffect.lo -MD -MP -MF $(DEPDIR)/ptmeffect.Tpo -c -o ptmeffect.lo `test -f 'dumb-kode54/src/it/ptmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/ptmeffect.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptmeffect.Tpo $(DEPDIR)/ptmeffect.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/ptmeffect.c' object='ptmeffect.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptmeffect.lo `test -f 'dumb-kode54/src/it/ptmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/ptmeffect.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptmeffect.lo `test -f 'dumb-kode54/src/it/ptmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/ptmeffect.c
loadstm.lo: dumb-kode54/src/it/loadstm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadstm.lo -MD -MP -MF $(DEPDIR)/loadstm.Tpo -c -o loadstm.lo `test -f 'dumb-kode54/src/it/loadstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadstm.Tpo $(DEPDIR)/loadstm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadstm.c' object='loadstm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadstm.lo -MD -MP -MF $(DEPDIR)/loadstm.Tpo -c -o loadstm.lo `test -f 'dumb-kode54/src/it/loadstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadstm.Tpo $(DEPDIR)/loadstm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadstm.c' object='loadstm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadstm.lo `test -f 'dumb-kode54/src/it/loadstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadstm.lo `test -f 'dumb-kode54/src/it/loadstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm.c
readxm.lo: dumb-kode54/src/it/readxm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readxm.lo -MD -MP -MF $(DEPDIR)/readxm.Tpo -c -o readxm.lo `test -f 'dumb-kode54/src/it/readxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readxm.Tpo $(DEPDIR)/readxm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readxm.c' object='readxm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readxm.lo -MD -MP -MF $(DEPDIR)/readxm.Tpo -c -o readxm.lo `test -f 'dumb-kode54/src/it/readxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readxm.Tpo $(DEPDIR)/readxm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readxm.c' object='readxm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readxm.lo `test -f 'dumb-kode54/src/it/readxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readxm.lo `test -f 'dumb-kode54/src/it/readxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm.c
itorder.lo: dumb-kode54/src/it/itorder.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itorder.lo -MD -MP -MF $(DEPDIR)/itorder.Tpo -c -o itorder.lo `test -f 'dumb-kode54/src/it/itorder.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itorder.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/itorder.Tpo $(DEPDIR)/itorder.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/itorder.c' object='itorder.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itorder.lo -MD -MP -MF $(DEPDIR)/itorder.Tpo -c -o itorder.lo `test -f 'dumb-kode54/src/it/itorder.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itorder.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/itorder.Tpo $(DEPDIR)/itorder.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/itorder.c' object='itorder.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itorder.lo `test -f 'dumb-kode54/src/it/itorder.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itorder.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itorder.lo `test -f 'dumb-kode54/src/it/itorder.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itorder.c
loadpsm.lo: dumb-kode54/src/it/loadpsm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadpsm.lo -MD -MP -MF $(DEPDIR)/loadpsm.Tpo -c -o loadpsm.lo `test -f 'dumb-kode54/src/it/loadpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadpsm.Tpo $(DEPDIR)/loadpsm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadpsm.c' object='loadpsm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadpsm.lo -MD -MP -MF $(DEPDIR)/loadpsm.Tpo -c -o loadpsm.lo `test -f 'dumb-kode54/src/it/loadpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadpsm.Tpo $(DEPDIR)/loadpsm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadpsm.c' object='loadpsm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadpsm.lo `test -f 'dumb-kode54/src/it/loadpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadpsm.lo `test -f 'dumb-kode54/src/it/loadpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm.c
itload.lo: dumb-kode54/src/it/itload.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itload.lo -MD -MP -MF $(DEPDIR)/itload.Tpo -c -o itload.lo `test -f 'dumb-kode54/src/it/itload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/itload.Tpo $(DEPDIR)/itload.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/itload.c' object='itload.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itload.lo -MD -MP -MF $(DEPDIR)/itload.Tpo -c -o itload.lo `test -f 'dumb-kode54/src/it/itload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/itload.Tpo $(DEPDIR)/itload.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/itload.c' object='itload.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itload.lo `test -f 'dumb-kode54/src/it/itload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itload.lo `test -f 'dumb-kode54/src/it/itload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload.c
loadasy2.lo: dumb-kode54/src/it/loadasy2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadasy2.lo -MD -MP -MF $(DEPDIR)/loadasy2.Tpo -c -o loadasy2.lo `test -f 'dumb-kode54/src/it/loadasy2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadasy2.Tpo $(DEPDIR)/loadasy2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadasy2.c' object='loadasy2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadasy2.lo -MD -MP -MF $(DEPDIR)/loadasy2.Tpo -c -o loadasy2.lo `test -f 'dumb-kode54/src/it/loadasy2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadasy2.Tpo $(DEPDIR)/loadasy2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadasy2.c' object='loadasy2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadasy2.lo `test -f 'dumb-kode54/src/it/loadasy2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadasy2.lo `test -f 'dumb-kode54/src/it/loadasy2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy2.c
readasy.lo: dumb-kode54/src/it/readasy.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readasy.lo -MD -MP -MF $(DEPDIR)/readasy.Tpo -c -o readasy.lo `test -f 'dumb-kode54/src/it/readasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readasy.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readasy.Tpo $(DEPDIR)/readasy.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readasy.c' object='readasy.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readasy.lo -MD -MP -MF $(DEPDIR)/readasy.Tpo -c -o readasy.lo `test -f 'dumb-kode54/src/it/readasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readasy.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readasy.Tpo $(DEPDIR)/readasy.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readasy.c' object='readasy.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readasy.lo `test -f 'dumb-kode54/src/it/readasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readasy.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readasy.lo `test -f 'dumb-kode54/src/it/readasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readasy.c
loadasy.lo: dumb-kode54/src/it/loadasy.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadasy.lo -MD -MP -MF $(DEPDIR)/loadasy.Tpo -c -o loadasy.lo `test -f 'dumb-kode54/src/it/loadasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadasy.Tpo $(DEPDIR)/loadasy.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadasy.c' object='loadasy.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadasy.lo -MD -MP -MF $(DEPDIR)/loadasy.Tpo -c -o loadasy.lo `test -f 'dumb-kode54/src/it/loadasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadasy.Tpo $(DEPDIR)/loadasy.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadasy.c' object='loadasy.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadasy.lo `test -f 'dumb-kode54/src/it/loadasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadasy.lo `test -f 'dumb-kode54/src/it/loadasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy.c
read669.lo: dumb-kode54/src/it/read669.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT read669.lo -MD -MP -MF $(DEPDIR)/read669.Tpo -c -o read669.lo `test -f 'dumb-kode54/src/it/read669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read669.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/read669.Tpo $(DEPDIR)/read669.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/read669.c' object='read669.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT read669.lo -MD -MP -MF $(DEPDIR)/read669.Tpo -c -o read669.lo `test -f 'dumb-kode54/src/it/read669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read669.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/read669.Tpo $(DEPDIR)/read669.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/read669.c' object='read669.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o read669.lo `test -f 'dumb-kode54/src/it/read669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read669.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o read669.lo `test -f 'dumb-kode54/src/it/read669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read669.c
readdsmf.lo: dumb-kode54/src/it/readdsmf.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readdsmf.lo -MD -MP -MF $(DEPDIR)/readdsmf.Tpo -c -o readdsmf.lo `test -f 'dumb-kode54/src/it/readdsmf.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readdsmf.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readdsmf.Tpo $(DEPDIR)/readdsmf.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readdsmf.c' object='readdsmf.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readdsmf.lo -MD -MP -MF $(DEPDIR)/readdsmf.Tpo -c -o readdsmf.lo `test -f 'dumb-kode54/src/it/readdsmf.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readdsmf.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readdsmf.Tpo $(DEPDIR)/readdsmf.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readdsmf.c' object='readdsmf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readdsmf.lo `test -f 'dumb-kode54/src/it/readdsmf.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readdsmf.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readdsmf.lo `test -f 'dumb-kode54/src/it/readdsmf.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readdsmf.c
reads3m.lo: dumb-kode54/src/it/reads3m.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reads3m.lo -MD -MP -MF $(DEPDIR)/reads3m.Tpo -c -o reads3m.lo `test -f 'dumb-kode54/src/it/reads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/reads3m.Tpo $(DEPDIR)/reads3m.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/reads3m.c' object='reads3m.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reads3m.lo -MD -MP -MF $(DEPDIR)/reads3m.Tpo -c -o reads3m.lo `test -f 'dumb-kode54/src/it/reads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reads3m.Tpo $(DEPDIR)/reads3m.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/reads3m.c' object='reads3m.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reads3m.lo `test -f 'dumb-kode54/src/it/reads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reads3m.lo `test -f 'dumb-kode54/src/it/reads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m.c
readriff.lo: dumb-kode54/src/it/readriff.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readriff.lo -MD -MP -MF $(DEPDIR)/readriff.Tpo -c -o readriff.lo `test -f 'dumb-kode54/src/it/readriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readriff.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readriff.Tpo $(DEPDIR)/readriff.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readriff.c' object='readriff.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readriff.lo -MD -MP -MF $(DEPDIR)/readriff.Tpo -c -o readriff.lo `test -f 'dumb-kode54/src/it/readriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readriff.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readriff.Tpo $(DEPDIR)/readriff.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readriff.c' object='readriff.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readriff.lo `test -f 'dumb-kode54/src/it/readriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readriff.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readriff.lo `test -f 'dumb-kode54/src/it/readriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readriff.c
load6692.lo: dumb-kode54/src/it/load6692.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT load6692.lo -MD -MP -MF $(DEPDIR)/load6692.Tpo -c -o load6692.lo `test -f 'dumb-kode54/src/it/load6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load6692.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/load6692.Tpo $(DEPDIR)/load6692.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/load6692.c' object='load6692.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT load6692.lo -MD -MP -MF $(DEPDIR)/load6692.Tpo -c -o load6692.lo `test -f 'dumb-kode54/src/it/load6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load6692.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/load6692.Tpo $(DEPDIR)/load6692.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/load6692.c' object='load6692.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o load6692.lo `test -f 'dumb-kode54/src/it/load6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load6692.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o load6692.lo `test -f 'dumb-kode54/src/it/load6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load6692.c
read6692.lo: dumb-kode54/src/it/read6692.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT read6692.lo -MD -MP -MF $(DEPDIR)/read6692.Tpo -c -o read6692.lo `test -f 'dumb-kode54/src/it/read6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read6692.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/read6692.Tpo $(DEPDIR)/read6692.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/read6692.c' object='read6692.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT read6692.lo -MD -MP -MF $(DEPDIR)/read6692.Tpo -c -o read6692.lo `test -f 'dumb-kode54/src/it/read6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read6692.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/read6692.Tpo $(DEPDIR)/read6692.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/read6692.c' object='read6692.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o read6692.lo `test -f 'dumb-kode54/src/it/read6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read6692.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o read6692.lo `test -f 'dumb-kode54/src/it/read6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read6692.c
readmod2.lo: dumb-kode54/src/it/readmod2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmod2.lo -MD -MP -MF $(DEPDIR)/readmod2.Tpo -c -o readmod2.lo `test -f 'dumb-kode54/src/it/readmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readmod2.Tpo $(DEPDIR)/readmod2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readmod2.c' object='readmod2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmod2.lo -MD -MP -MF $(DEPDIR)/readmod2.Tpo -c -o readmod2.lo `test -f 'dumb-kode54/src/it/readmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readmod2.Tpo $(DEPDIR)/readmod2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readmod2.c' object='readmod2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmod2.lo `test -f 'dumb-kode54/src/it/readmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmod2.lo `test -f 'dumb-kode54/src/it/readmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod2.c
loadriff2.lo: dumb-kode54/src/it/loadriff2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadriff2.lo -MD -MP -MF $(DEPDIR)/loadriff2.Tpo -c -o loadriff2.lo `test -f 'dumb-kode54/src/it/loadriff2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadriff2.Tpo $(DEPDIR)/loadriff2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadriff2.c' object='loadriff2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadriff2.lo -MD -MP -MF $(DEPDIR)/loadriff2.Tpo -c -o loadriff2.lo `test -f 'dumb-kode54/src/it/loadriff2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadriff2.Tpo $(DEPDIR)/loadriff2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadriff2.c' object='loadriff2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadriff2.lo `test -f 'dumb-kode54/src/it/loadriff2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadriff2.lo `test -f 'dumb-kode54/src/it/loadriff2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff2.c
xmeffect.lo: dumb-kode54/src/it/xmeffect.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmeffect.lo -MD -MP -MF $(DEPDIR)/xmeffect.Tpo -c -o xmeffect.lo `test -f 'dumb-kode54/src/it/xmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/xmeffect.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xmeffect.Tpo $(DEPDIR)/xmeffect.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/xmeffect.c' object='xmeffect.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmeffect.lo -MD -MP -MF $(DEPDIR)/xmeffect.Tpo -c -o xmeffect.lo `test -f 'dumb-kode54/src/it/xmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/xmeffect.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xmeffect.Tpo $(DEPDIR)/xmeffect.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/xmeffect.c' object='xmeffect.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmeffect.lo `test -f 'dumb-kode54/src/it/xmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/xmeffect.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmeffect.lo `test -f 'dumb-kode54/src/it/xmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/xmeffect.c
loadmod2.lo: dumb-kode54/src/it/loadmod2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmod2.lo -MD -MP -MF $(DEPDIR)/loadmod2.Tpo -c -o loadmod2.lo `test -f 'dumb-kode54/src/it/loadmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadmod2.Tpo $(DEPDIR)/loadmod2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadmod2.c' object='loadmod2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmod2.lo -MD -MP -MF $(DEPDIR)/loadmod2.Tpo -c -o loadmod2.lo `test -f 'dumb-kode54/src/it/loadmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadmod2.Tpo $(DEPDIR)/loadmod2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadmod2.c' object='loadmod2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmod2.lo `test -f 'dumb-kode54/src/it/loadmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmod2.lo `test -f 'dumb-kode54/src/it/loadmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod2.c
itread.lo: dumb-kode54/src/it/itread.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itread.lo -MD -MP -MF $(DEPDIR)/itread.Tpo -c -o itread.lo `test -f 'dumb-kode54/src/it/itread.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/itread.Tpo $(DEPDIR)/itread.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/itread.c' object='itread.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itread.lo -MD -MP -MF $(DEPDIR)/itread.Tpo -c -o itread.lo `test -f 'dumb-kode54/src/it/itread.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/itread.Tpo $(DEPDIR)/itread.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/itread.c' object='itread.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itread.lo `test -f 'dumb-kode54/src/it/itread.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itread.lo `test -f 'dumb-kode54/src/it/itread.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread.c
itunload.lo: dumb-kode54/src/it/itunload.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itunload.lo -MD -MP -MF $(DEPDIR)/itunload.Tpo -c -o itunload.lo `test -f 'dumb-kode54/src/it/itunload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itunload.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/itunload.Tpo $(DEPDIR)/itunload.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/itunload.c' object='itunload.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itunload.lo -MD -MP -MF $(DEPDIR)/itunload.Tpo -c -o itunload.lo `test -f 'dumb-kode54/src/it/itunload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itunload.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/itunload.Tpo $(DEPDIR)/itunload.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/itunload.c' object='itunload.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itunload.lo `test -f 'dumb-kode54/src/it/itunload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itunload.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itunload.lo `test -f 'dumb-kode54/src/it/itunload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itunload.c
loadmtm2.lo: dumb-kode54/src/it/loadmtm2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmtm2.lo -MD -MP -MF $(DEPDIR)/loadmtm2.Tpo -c -o loadmtm2.lo `test -f 'dumb-kode54/src/it/loadmtm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadmtm2.Tpo $(DEPDIR)/loadmtm2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadmtm2.c' object='loadmtm2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmtm2.lo -MD -MP -MF $(DEPDIR)/loadmtm2.Tpo -c -o loadmtm2.lo `test -f 'dumb-kode54/src/it/loadmtm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadmtm2.Tpo $(DEPDIR)/loadmtm2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadmtm2.c' object='loadmtm2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmtm2.lo `test -f 'dumb-kode54/src/it/loadmtm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmtm2.lo `test -f 'dumb-kode54/src/it/loadmtm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm2.c
loadptm.lo: dumb-kode54/src/it/loadptm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadptm.lo -MD -MP -MF $(DEPDIR)/loadptm.Tpo -c -o loadptm.lo `test -f 'dumb-kode54/src/it/loadptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadptm.Tpo $(DEPDIR)/loadptm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadptm.c' object='loadptm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadptm.lo -MD -MP -MF $(DEPDIR)/loadptm.Tpo -c -o loadptm.lo `test -f 'dumb-kode54/src/it/loadptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadptm.Tpo $(DEPDIR)/loadptm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadptm.c' object='loadptm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadptm.lo `test -f 'dumb-kode54/src/it/loadptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadptm.lo `test -f 'dumb-kode54/src/it/loadptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm.c
itload2.lo: dumb-kode54/src/it/itload2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itload2.lo -MD -MP -MF $(DEPDIR)/itload2.Tpo -c -o itload2.lo `test -f 'dumb-kode54/src/it/itload2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/itload2.Tpo $(DEPDIR)/itload2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/itload2.c' object='itload2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itload2.lo -MD -MP -MF $(DEPDIR)/itload2.Tpo -c -o itload2.lo `test -f 'dumb-kode54/src/it/itload2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/itload2.Tpo $(DEPDIR)/itload2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/itload2.c' object='itload2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itload2.lo `test -f 'dumb-kode54/src/it/itload2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itload2.lo `test -f 'dumb-kode54/src/it/itload2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload2.c
loadmtm.lo: dumb-kode54/src/it/loadmtm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmtm.lo -MD -MP -MF $(DEPDIR)/loadmtm.Tpo -c -o loadmtm.lo `test -f 'dumb-kode54/src/it/loadmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadmtm.Tpo $(DEPDIR)/loadmtm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadmtm.c' object='loadmtm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmtm.lo -MD -MP -MF $(DEPDIR)/loadmtm.Tpo -c -o loadmtm.lo `test -f 'dumb-kode54/src/it/loadmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadmtm.Tpo $(DEPDIR)/loadmtm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadmtm.c' object='loadmtm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmtm.lo `test -f 'dumb-kode54/src/it/loadmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmtm.lo `test -f 'dumb-kode54/src/it/loadmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm.c
loadoldpsm.lo: dumb-kode54/src/it/loadoldpsm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadoldpsm.lo -MD -MP -MF $(DEPDIR)/loadoldpsm.Tpo -c -o loadoldpsm.lo `test -f 'dumb-kode54/src/it/loadoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadoldpsm.Tpo $(DEPDIR)/loadoldpsm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadoldpsm.c' object='loadoldpsm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadoldpsm.lo -MD -MP -MF $(DEPDIR)/loadoldpsm.Tpo -c -o loadoldpsm.lo `test -f 'dumb-kode54/src/it/loadoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadoldpsm.Tpo $(DEPDIR)/loadoldpsm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadoldpsm.c' object='loadoldpsm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadoldpsm.lo `test -f 'dumb-kode54/src/it/loadoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadoldpsm.lo `test -f 'dumb-kode54/src/it/loadoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm.c
loadstm2.lo: dumb-kode54/src/it/loadstm2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadstm2.lo -MD -MP -MF $(DEPDIR)/loadstm2.Tpo -c -o loadstm2.lo `test -f 'dumb-kode54/src/it/loadstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadstm2.Tpo $(DEPDIR)/loadstm2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadstm2.c' object='loadstm2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadstm2.lo -MD -MP -MF $(DEPDIR)/loadstm2.Tpo -c -o loadstm2.lo `test -f 'dumb-kode54/src/it/loadstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadstm2.Tpo $(DEPDIR)/loadstm2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadstm2.c' object='loadstm2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadstm2.lo `test -f 'dumb-kode54/src/it/loadstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadstm2.lo `test -f 'dumb-kode54/src/it/loadstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm2.c
readstm2.lo: dumb-kode54/src/it/readstm2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readstm2.lo -MD -MP -MF $(DEPDIR)/readstm2.Tpo -c -o readstm2.lo `test -f 'dumb-kode54/src/it/readstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readstm2.Tpo $(DEPDIR)/readstm2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readstm2.c' object='readstm2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readstm2.lo -MD -MP -MF $(DEPDIR)/readstm2.Tpo -c -o readstm2.lo `test -f 'dumb-kode54/src/it/readstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readstm2.Tpo $(DEPDIR)/readstm2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readstm2.c' object='readstm2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readstm2.lo `test -f 'dumb-kode54/src/it/readstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readstm2.lo `test -f 'dumb-kode54/src/it/readstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm2.c
readptm.lo: dumb-kode54/src/it/readptm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readptm.lo -MD -MP -MF $(DEPDIR)/readptm.Tpo -c -o readptm.lo `test -f 'dumb-kode54/src/it/readptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readptm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readptm.Tpo $(DEPDIR)/readptm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readptm.c' object='readptm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readptm.lo -MD -MP -MF $(DEPDIR)/readptm.Tpo -c -o readptm.lo `test -f 'dumb-kode54/src/it/readptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readptm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readptm.Tpo $(DEPDIR)/readptm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readptm.c' object='readptm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readptm.lo `test -f 'dumb-kode54/src/it/readptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readptm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readptm.lo `test -f 'dumb-kode54/src/it/readptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readptm.c
itrender.lo: dumb-kode54/src/it/itrender.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itrender.lo -MD -MP -MF $(DEPDIR)/itrender.Tpo -c -o itrender.lo `test -f 'dumb-kode54/src/it/itrender.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itrender.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/itrender.Tpo $(DEPDIR)/itrender.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/itrender.c' object='itrender.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itrender.lo -MD -MP -MF $(DEPDIR)/itrender.Tpo -c -o itrender.lo `test -f 'dumb-kode54/src/it/itrender.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itrender.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/itrender.Tpo $(DEPDIR)/itrender.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/itrender.c' object='itrender.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itrender.lo `test -f 'dumb-kode54/src/it/itrender.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itrender.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itrender.lo `test -f 'dumb-kode54/src/it/itrender.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itrender.c
readoldpsm.lo: dumb-kode54/src/it/readoldpsm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readoldpsm.lo -MD -MP -MF $(DEPDIR)/readoldpsm.Tpo -c -o readoldpsm.lo `test -f 'dumb-kode54/src/it/readoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readoldpsm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readoldpsm.Tpo $(DEPDIR)/readoldpsm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readoldpsm.c' object='readoldpsm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readoldpsm.lo -MD -MP -MF $(DEPDIR)/readoldpsm.Tpo -c -o readoldpsm.lo `test -f 'dumb-kode54/src/it/readoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readoldpsm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readoldpsm.Tpo $(DEPDIR)/readoldpsm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readoldpsm.c' object='readoldpsm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readoldpsm.lo `test -f 'dumb-kode54/src/it/readoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readoldpsm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readoldpsm.lo `test -f 'dumb-kode54/src/it/readoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readoldpsm.c
reads3m2.lo: dumb-kode54/src/it/reads3m2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reads3m2.lo -MD -MP -MF $(DEPDIR)/reads3m2.Tpo -c -o reads3m2.lo `test -f 'dumb-kode54/src/it/reads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/reads3m2.Tpo $(DEPDIR)/reads3m2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/reads3m2.c' object='reads3m2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reads3m2.lo -MD -MP -MF $(DEPDIR)/reads3m2.Tpo -c -o reads3m2.lo `test -f 'dumb-kode54/src/it/reads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reads3m2.Tpo $(DEPDIR)/reads3m2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/reads3m2.c' object='reads3m2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reads3m2.lo `test -f 'dumb-kode54/src/it/reads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reads3m2.lo `test -f 'dumb-kode54/src/it/reads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m2.c
readpsm.lo: dumb-kode54/src/it/readpsm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readpsm.lo -MD -MP -MF $(DEPDIR)/readpsm.Tpo -c -o readpsm.lo `test -f 'dumb-kode54/src/it/readpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readpsm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readpsm.Tpo $(DEPDIR)/readpsm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readpsm.c' object='readpsm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readpsm.lo -MD -MP -MF $(DEPDIR)/readpsm.Tpo -c -o readpsm.lo `test -f 'dumb-kode54/src/it/readpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readpsm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readpsm.Tpo $(DEPDIR)/readpsm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readpsm.c' object='readpsm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readpsm.lo `test -f 'dumb-kode54/src/it/readpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readpsm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readpsm.lo `test -f 'dumb-kode54/src/it/readpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readpsm.c
itread2.lo: dumb-kode54/src/it/itread2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itread2.lo -MD -MP -MF $(DEPDIR)/itread2.Tpo -c -o itread2.lo `test -f 'dumb-kode54/src/it/itread2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/itread2.Tpo $(DEPDIR)/itread2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/itread2.c' object='itread2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itread2.lo -MD -MP -MF $(DEPDIR)/itread2.Tpo -c -o itread2.lo `test -f 'dumb-kode54/src/it/itread2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/itread2.Tpo $(DEPDIR)/itread2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/itread2.c' object='itread2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itread2.lo `test -f 'dumb-kode54/src/it/itread2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itread2.lo `test -f 'dumb-kode54/src/it/itread2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread2.c
loads3m2.lo: dumb-kode54/src/it/loads3m2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loads3m2.lo -MD -MP -MF $(DEPDIR)/loads3m2.Tpo -c -o loads3m2.lo `test -f 'dumb-kode54/src/it/loads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loads3m2.Tpo $(DEPDIR)/loads3m2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loads3m2.c' object='loads3m2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loads3m2.lo -MD -MP -MF $(DEPDIR)/loads3m2.Tpo -c -o loads3m2.lo `test -f 'dumb-kode54/src/it/loads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loads3m2.Tpo $(DEPDIR)/loads3m2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loads3m2.c' object='loads3m2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loads3m2.lo `test -f 'dumb-kode54/src/it/loads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loads3m2.lo `test -f 'dumb-kode54/src/it/loads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m2.c
loadpsm2.lo: dumb-kode54/src/it/loadpsm2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadpsm2.lo -MD -MP -MF $(DEPDIR)/loadpsm2.Tpo -c -o loadpsm2.lo `test -f 'dumb-kode54/src/it/loadpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadpsm2.Tpo $(DEPDIR)/loadpsm2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadpsm2.c' object='loadpsm2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadpsm2.lo -MD -MP -MF $(DEPDIR)/loadpsm2.Tpo -c -o loadpsm2.lo `test -f 'dumb-kode54/src/it/loadpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadpsm2.Tpo $(DEPDIR)/loadpsm2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadpsm2.c' object='loadpsm2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadpsm2.lo `test -f 'dumb-kode54/src/it/loadpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadpsm2.lo `test -f 'dumb-kode54/src/it/loadpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm2.c
loadxm2.lo: dumb-kode54/src/it/loadxm2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadxm2.lo -MD -MP -MF $(DEPDIR)/loadxm2.Tpo -c -o loadxm2.lo `test -f 'dumb-kode54/src/it/loadxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadxm2.Tpo $(DEPDIR)/loadxm2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadxm2.c' object='loadxm2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadxm2.lo -MD -MP -MF $(DEPDIR)/loadxm2.Tpo -c -o loadxm2.lo `test -f 'dumb-kode54/src/it/loadxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadxm2.Tpo $(DEPDIR)/loadxm2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadxm2.c' object='loadxm2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadxm2.lo `test -f 'dumb-kode54/src/it/loadxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadxm2.lo `test -f 'dumb-kode54/src/it/loadxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm2.c
loadptm2.lo: dumb-kode54/src/it/loadptm2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadptm2.lo -MD -MP -MF $(DEPDIR)/loadptm2.Tpo -c -o loadptm2.lo `test -f 'dumb-kode54/src/it/loadptm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadptm2.Tpo $(DEPDIR)/loadptm2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadptm2.c' object='loadptm2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadptm2.lo -MD -MP -MF $(DEPDIR)/loadptm2.Tpo -c -o loadptm2.lo `test -f 'dumb-kode54/src/it/loadptm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadptm2.Tpo $(DEPDIR)/loadptm2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadptm2.c' object='loadptm2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadptm2.lo `test -f 'dumb-kode54/src/it/loadptm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadptm2.lo `test -f 'dumb-kode54/src/it/loadptm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm2.c
readxm2.lo: dumb-kode54/src/it/readxm2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readxm2.lo -MD -MP -MF $(DEPDIR)/readxm2.Tpo -c -o readxm2.lo `test -f 'dumb-kode54/src/it/readxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readxm2.Tpo $(DEPDIR)/readxm2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readxm2.c' object='readxm2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readxm2.lo -MD -MP -MF $(DEPDIR)/readxm2.Tpo -c -o readxm2.lo `test -f 'dumb-kode54/src/it/readxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readxm2.Tpo $(DEPDIR)/readxm2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readxm2.c' object='readxm2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readxm2.lo `test -f 'dumb-kode54/src/it/readxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readxm2.lo `test -f 'dumb-kode54/src/it/readxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm2.c
itmisc.lo: dumb-kode54/src/it/itmisc.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itmisc.lo -MD -MP -MF $(DEPDIR)/itmisc.Tpo -c -o itmisc.lo `test -f 'dumb-kode54/src/it/itmisc.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itmisc.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/itmisc.Tpo $(DEPDIR)/itmisc.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/itmisc.c' object='itmisc.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itmisc.lo -MD -MP -MF $(DEPDIR)/itmisc.Tpo -c -o itmisc.lo `test -f 'dumb-kode54/src/it/itmisc.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itmisc.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/itmisc.Tpo $(DEPDIR)/itmisc.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/itmisc.c' object='itmisc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itmisc.lo `test -f 'dumb-kode54/src/it/itmisc.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itmisc.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itmisc.lo `test -f 'dumb-kode54/src/it/itmisc.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itmisc.c
loadoldpsm2.lo: dumb-kode54/src/it/loadoldpsm2.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadoldpsm2.lo -MD -MP -MF $(DEPDIR)/loadoldpsm2.Tpo -c -o loadoldpsm2.lo `test -f 'dumb-kode54/src/it/loadoldpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm2.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadoldpsm2.Tpo $(DEPDIR)/loadoldpsm2.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadoldpsm2.c' object='loadoldpsm2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadoldpsm2.lo -MD -MP -MF $(DEPDIR)/loadoldpsm2.Tpo -c -o loadoldpsm2.lo `test -f 'dumb-kode54/src/it/loadoldpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm2.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadoldpsm2.Tpo $(DEPDIR)/loadoldpsm2.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadoldpsm2.c' object='loadoldpsm2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadoldpsm2.lo `test -f 'dumb-kode54/src/it/loadoldpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm2.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadoldpsm2.lo `test -f 'dumb-kode54/src/it/loadoldpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm2.c
readmod.lo: dumb-kode54/src/it/readmod.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmod.lo -MD -MP -MF $(DEPDIR)/readmod.Tpo -c -o readmod.lo `test -f 'dumb-kode54/src/it/readmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readmod.Tpo $(DEPDIR)/readmod.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readmod.c' object='readmod.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmod.lo -MD -MP -MF $(DEPDIR)/readmod.Tpo -c -o readmod.lo `test -f 'dumb-kode54/src/it/readmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readmod.Tpo $(DEPDIR)/readmod.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readmod.c' object='readmod.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmod.lo `test -f 'dumb-kode54/src/it/readmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmod.lo `test -f 'dumb-kode54/src/it/readmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod.c
loadmod.lo: dumb-kode54/src/it/loadmod.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmod.lo -MD -MP -MF $(DEPDIR)/loadmod.Tpo -c -o loadmod.lo `test -f 'dumb-kode54/src/it/loadmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadmod.Tpo $(DEPDIR)/loadmod.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadmod.c' object='loadmod.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmod.lo -MD -MP -MF $(DEPDIR)/loadmod.Tpo -c -o loadmod.lo `test -f 'dumb-kode54/src/it/loadmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadmod.Tpo $(DEPDIR)/loadmod.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadmod.c' object='loadmod.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmod.lo `test -f 'dumb-kode54/src/it/loadmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmod.lo `test -f 'dumb-kode54/src/it/loadmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod.c
loadriff.lo: dumb-kode54/src/it/loadriff.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadriff.lo -MD -MP -MF $(DEPDIR)/loadriff.Tpo -c -o loadriff.lo `test -f 'dumb-kode54/src/it/loadriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadriff.Tpo $(DEPDIR)/loadriff.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/loadriff.c' object='loadriff.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadriff.lo -MD -MP -MF $(DEPDIR)/loadriff.Tpo -c -o loadriff.lo `test -f 'dumb-kode54/src/it/loadriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadriff.Tpo $(DEPDIR)/loadriff.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/loadriff.c' object='loadriff.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadriff.lo `test -f 'dumb-kode54/src/it/loadriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadriff.lo `test -f 'dumb-kode54/src/it/loadriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff.c
readmtm.lo: dumb-kode54/src/it/readmtm.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmtm.lo -MD -MP -MF $(DEPDIR)/readmtm.Tpo -c -o readmtm.lo `test -f 'dumb-kode54/src/it/readmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmtm.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readmtm.Tpo $(DEPDIR)/readmtm.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/readmtm.c' object='readmtm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmtm.lo -MD -MP -MF $(DEPDIR)/readmtm.Tpo -c -o readmtm.lo `test -f 'dumb-kode54/src/it/readmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmtm.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readmtm.Tpo $(DEPDIR)/readmtm.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/readmtm.c' object='readmtm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmtm.lo `test -f 'dumb-kode54/src/it/readmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmtm.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmtm.lo `test -f 'dumb-kode54/src/it/readmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmtm.c
load669.lo: dumb-kode54/src/it/load669.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT load669.lo -MD -MP -MF $(DEPDIR)/load669.Tpo -c -o load669.lo `test -f 'dumb-kode54/src/it/load669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load669.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/load669.Tpo $(DEPDIR)/load669.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/it/load669.c' object='load669.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT load669.lo -MD -MP -MF $(DEPDIR)/load669.Tpo -c -o load669.lo `test -f 'dumb-kode54/src/it/load669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load669.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/load669.Tpo $(DEPDIR)/load669.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/it/load669.c' object='load669.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o load669.lo `test -f 'dumb-kode54/src/it/load669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load669.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o load669.lo `test -f 'dumb-kode54/src/it/load669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load669.c
rendduh.lo: dumb-kode54/src/core/rendduh.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rendduh.lo -MD -MP -MF $(DEPDIR)/rendduh.Tpo -c -o rendduh.lo `test -f 'dumb-kode54/src/core/rendduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendduh.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/rendduh.Tpo $(DEPDIR)/rendduh.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/core/rendduh.c' object='rendduh.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rendduh.lo -MD -MP -MF $(DEPDIR)/rendduh.Tpo -c -o rendduh.lo `test -f 'dumb-kode54/src/core/rendduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendduh.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rendduh.Tpo $(DEPDIR)/rendduh.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/core/rendduh.c' object='rendduh.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rendduh.lo `test -f 'dumb-kode54/src/core/rendduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendduh.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rendduh.lo `test -f 'dumb-kode54/src/core/rendduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendduh.c
readduh.lo: dumb-kode54/src/core/readduh.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readduh.lo -MD -MP -MF $(DEPDIR)/readduh.Tpo -c -o readduh.lo `test -f 'dumb-kode54/src/core/readduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/readduh.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/readduh.Tpo $(DEPDIR)/readduh.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/core/readduh.c' object='readduh.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readduh.lo -MD -MP -MF $(DEPDIR)/readduh.Tpo -c -o readduh.lo `test -f 'dumb-kode54/src/core/readduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/readduh.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/readduh.Tpo $(DEPDIR)/readduh.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/core/readduh.c' object='readduh.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readduh.lo `test -f 'dumb-kode54/src/core/readduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/readduh.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readduh.lo `test -f 'dumb-kode54/src/core/readduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/readduh.c
duhlen.lo: dumb-kode54/src/core/duhlen.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT duhlen.lo -MD -MP -MF $(DEPDIR)/duhlen.Tpo -c -o duhlen.lo `test -f 'dumb-kode54/src/core/duhlen.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhlen.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/duhlen.Tpo $(DEPDIR)/duhlen.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/core/duhlen.c' object='duhlen.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT duhlen.lo -MD -MP -MF $(DEPDIR)/duhlen.Tpo -c -o duhlen.lo `test -f 'dumb-kode54/src/core/duhlen.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhlen.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/duhlen.Tpo $(DEPDIR)/duhlen.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/core/duhlen.c' object='duhlen.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o duhlen.lo `test -f 'dumb-kode54/src/core/duhlen.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhlen.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o duhlen.lo `test -f 'dumb-kode54/src/core/duhlen.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhlen.c
loadduh.lo: dumb-kode54/src/core/loadduh.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadduh.lo -MD -MP -MF $(DEPDIR)/loadduh.Tpo -c -o loadduh.lo `test -f 'dumb-kode54/src/core/loadduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/loadduh.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadduh.Tpo $(DEPDIR)/loadduh.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/core/loadduh.c' object='loadduh.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadduh.lo -MD -MP -MF $(DEPDIR)/loadduh.Tpo -c -o loadduh.lo `test -f 'dumb-kode54/src/core/loadduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/loadduh.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/loadduh.Tpo $(DEPDIR)/loadduh.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/core/loadduh.c' object='loadduh.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadduh.lo `test -f 'dumb-kode54/src/core/loadduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/loadduh.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadduh.lo `test -f 'dumb-kode54/src/core/loadduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/loadduh.c
unload.lo: dumb-kode54/src/core/unload.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unload.lo -MD -MP -MF $(DEPDIR)/unload.Tpo -c -o unload.lo `test -f 'dumb-kode54/src/core/unload.c' || echo '$(srcdir)/'`dumb-kode54/src/core/unload.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unload.Tpo $(DEPDIR)/unload.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/core/unload.c' object='unload.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unload.lo -MD -MP -MF $(DEPDIR)/unload.Tpo -c -o unload.lo `test -f 'dumb-kode54/src/core/unload.c' || echo '$(srcdir)/'`dumb-kode54/src/core/unload.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unload.Tpo $(DEPDIR)/unload.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/core/unload.c' object='unload.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unload.lo `test -f 'dumb-kode54/src/core/unload.c' || echo '$(srcdir)/'`dumb-kode54/src/core/unload.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unload.lo `test -f 'dumb-kode54/src/core/unload.c' || echo '$(srcdir)/'`dumb-kode54/src/core/unload.c
duhtag.lo: dumb-kode54/src/core/duhtag.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT duhtag.lo -MD -MP -MF $(DEPDIR)/duhtag.Tpo -c -o duhtag.lo `test -f 'dumb-kode54/src/core/duhtag.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhtag.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/duhtag.Tpo $(DEPDIR)/duhtag.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/core/duhtag.c' object='duhtag.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT duhtag.lo -MD -MP -MF $(DEPDIR)/duhtag.Tpo -c -o duhtag.lo `test -f 'dumb-kode54/src/core/duhtag.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhtag.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/duhtag.Tpo $(DEPDIR)/duhtag.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/core/duhtag.c' object='duhtag.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o duhtag.lo `test -f 'dumb-kode54/src/core/duhtag.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhtag.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o duhtag.lo `test -f 'dumb-kode54/src/core/duhtag.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhtag.c
register.lo: dumb-kode54/src/core/register.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT register.lo -MD -MP -MF $(DEPDIR)/register.Tpo -c -o register.lo `test -f 'dumb-kode54/src/core/register.c' || echo '$(srcdir)/'`dumb-kode54/src/core/register.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/register.Tpo $(DEPDIR)/register.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/core/register.c' object='register.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT register.lo -MD -MP -MF $(DEPDIR)/register.Tpo -c -o register.lo `test -f 'dumb-kode54/src/core/register.c' || echo '$(srcdir)/'`dumb-kode54/src/core/register.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/register.Tpo $(DEPDIR)/register.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/core/register.c' object='register.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o register.lo `test -f 'dumb-kode54/src/core/register.c' || echo '$(srcdir)/'`dumb-kode54/src/core/register.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o register.lo `test -f 'dumb-kode54/src/core/register.c' || echo '$(srcdir)/'`dumb-kode54/src/core/register.c
rawsig.lo: dumb-kode54/src/core/rawsig.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rawsig.lo -MD -MP -MF $(DEPDIR)/rawsig.Tpo -c -o rawsig.lo `test -f 'dumb-kode54/src/core/rawsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rawsig.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/rawsig.Tpo $(DEPDIR)/rawsig.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/core/rawsig.c' object='rawsig.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rawsig.lo -MD -MP -MF $(DEPDIR)/rawsig.Tpo -c -o rawsig.lo `test -f 'dumb-kode54/src/core/rawsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rawsig.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rawsig.Tpo $(DEPDIR)/rawsig.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/core/rawsig.c' object='rawsig.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rawsig.lo `test -f 'dumb-kode54/src/core/rawsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rawsig.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rawsig.lo `test -f 'dumb-kode54/src/core/rawsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rawsig.c
dumbfile.lo: dumb-kode54/src/core/dumbfile.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dumbfile.lo -MD -MP -MF $(DEPDIR)/dumbfile.Tpo -c -o dumbfile.lo `test -f 'dumb-kode54/src/core/dumbfile.c' || echo '$(srcdir)/'`dumb-kode54/src/core/dumbfile.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/dumbfile.Tpo $(DEPDIR)/dumbfile.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/core/dumbfile.c' object='dumbfile.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dumbfile.lo -MD -MP -MF $(DEPDIR)/dumbfile.Tpo -c -o dumbfile.lo `test -f 'dumb-kode54/src/core/dumbfile.c' || echo '$(srcdir)/'`dumb-kode54/src/core/dumbfile.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dumbfile.Tpo $(DEPDIR)/dumbfile.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/core/dumbfile.c' object='dumbfile.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dumbfile.lo `test -f 'dumb-kode54/src/core/dumbfile.c' || echo '$(srcdir)/'`dumb-kode54/src/core/dumbfile.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dumbfile.lo `test -f 'dumb-kode54/src/core/dumbfile.c' || echo '$(srcdir)/'`dumb-kode54/src/core/dumbfile.c
rendsig.lo: dumb-kode54/src/core/rendsig.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rendsig.lo -MD -MP -MF $(DEPDIR)/rendsig.Tpo -c -o rendsig.lo `test -f 'dumb-kode54/src/core/rendsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendsig.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/rendsig.Tpo $(DEPDIR)/rendsig.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/core/rendsig.c' object='rendsig.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rendsig.lo -MD -MP -MF $(DEPDIR)/rendsig.Tpo -c -o rendsig.lo `test -f 'dumb-kode54/src/core/rendsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendsig.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rendsig.Tpo $(DEPDIR)/rendsig.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/core/rendsig.c' object='rendsig.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rendsig.lo `test -f 'dumb-kode54/src/core/rendsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendsig.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rendsig.lo `test -f 'dumb-kode54/src/core/rendsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendsig.c
makeduh.lo: dumb-kode54/src/core/makeduh.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT makeduh.lo -MD -MP -MF $(DEPDIR)/makeduh.Tpo -c -o makeduh.lo `test -f 'dumb-kode54/src/core/makeduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/makeduh.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/makeduh.Tpo $(DEPDIR)/makeduh.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/core/makeduh.c' object='makeduh.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT makeduh.lo -MD -MP -MF $(DEPDIR)/makeduh.Tpo -c -o makeduh.lo `test -f 'dumb-kode54/src/core/makeduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/makeduh.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makeduh.Tpo $(DEPDIR)/makeduh.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/core/makeduh.c' object='makeduh.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o makeduh.lo `test -f 'dumb-kode54/src/core/makeduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/makeduh.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o makeduh.lo `test -f 'dumb-kode54/src/core/makeduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/makeduh.c
atexit.lo: dumb-kode54/src/core/atexit.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atexit.lo -MD -MP -MF $(DEPDIR)/atexit.Tpo -c -o atexit.lo `test -f 'dumb-kode54/src/core/atexit.c' || echo '$(srcdir)/'`dumb-kode54/src/core/atexit.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/atexit.Tpo $(DEPDIR)/atexit.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/core/atexit.c' object='atexit.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atexit.lo -MD -MP -MF $(DEPDIR)/atexit.Tpo -c -o atexit.lo `test -f 'dumb-kode54/src/core/atexit.c' || echo '$(srcdir)/'`dumb-kode54/src/core/atexit.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/atexit.Tpo $(DEPDIR)/atexit.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/core/atexit.c' object='atexit.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atexit.lo `test -f 'dumb-kode54/src/core/atexit.c' || echo '$(srcdir)/'`dumb-kode54/src/core/atexit.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atexit.lo `test -f 'dumb-kode54/src/core/atexit.c' || echo '$(srcdir)/'`dumb-kode54/src/core/atexit.c
clickrem.lo: dumb-kode54/src/helpers/clickrem.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clickrem.lo -MD -MP -MF $(DEPDIR)/clickrem.Tpo -c -o clickrem.lo `test -f 'dumb-kode54/src/helpers/clickrem.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/clickrem.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/clickrem.Tpo $(DEPDIR)/clickrem.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/helpers/clickrem.c' object='clickrem.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clickrem.lo -MD -MP -MF $(DEPDIR)/clickrem.Tpo -c -o clickrem.lo `test -f 'dumb-kode54/src/helpers/clickrem.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/clickrem.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/clickrem.Tpo $(DEPDIR)/clickrem.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/helpers/clickrem.c' object='clickrem.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clickrem.lo `test -f 'dumb-kode54/src/helpers/clickrem.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/clickrem.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clickrem.lo `test -f 'dumb-kode54/src/helpers/clickrem.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/clickrem.c
silence.lo: dumb-kode54/src/helpers/silence.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT silence.lo -MD -MP -MF $(DEPDIR)/silence.Tpo -c -o silence.lo `test -f 'dumb-kode54/src/helpers/silence.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/silence.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/silence.Tpo $(DEPDIR)/silence.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/helpers/silence.c' object='silence.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT silence.lo -MD -MP -MF $(DEPDIR)/silence.Tpo -c -o silence.lo `test -f 'dumb-kode54/src/helpers/silence.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/silence.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/silence.Tpo $(DEPDIR)/silence.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/helpers/silence.c' object='silence.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o silence.lo `test -f 'dumb-kode54/src/helpers/silence.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/silence.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o silence.lo `test -f 'dumb-kode54/src/helpers/silence.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/silence.c
stdfile.lo: dumb-kode54/src/helpers/stdfile.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdfile.lo -MD -MP -MF $(DEPDIR)/stdfile.Tpo -c -o stdfile.lo `test -f 'dumb-kode54/src/helpers/stdfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/stdfile.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/stdfile.Tpo $(DEPDIR)/stdfile.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/helpers/stdfile.c' object='stdfile.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdfile.lo -MD -MP -MF $(DEPDIR)/stdfile.Tpo -c -o stdfile.lo `test -f 'dumb-kode54/src/helpers/stdfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/stdfile.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stdfile.Tpo $(DEPDIR)/stdfile.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/helpers/stdfile.c' object='stdfile.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdfile.lo `test -f 'dumb-kode54/src/helpers/stdfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/stdfile.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdfile.lo `test -f 'dumb-kode54/src/helpers/stdfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/stdfile.c
resample.lo: dumb-kode54/src/helpers/resample.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT resample.lo -MD -MP -MF $(DEPDIR)/resample.Tpo -c -o resample.lo `test -f 'dumb-kode54/src/helpers/resample.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/resample.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/resample.Tpo $(DEPDIR)/resample.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/helpers/resample.c' object='resample.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT resample.lo -MD -MP -MF $(DEPDIR)/resample.Tpo -c -o resample.lo `test -f 'dumb-kode54/src/helpers/resample.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/resample.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/resample.Tpo $(DEPDIR)/resample.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/helpers/resample.c' object='resample.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o resample.lo `test -f 'dumb-kode54/src/helpers/resample.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/resample.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o resample.lo `test -f 'dumb-kode54/src/helpers/resample.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/resample.c
riff.lo: dumb-kode54/src/helpers/riff.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT riff.lo -MD -MP -MF $(DEPDIR)/riff.Tpo -c -o riff.lo `test -f 'dumb-kode54/src/helpers/riff.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/riff.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/riff.Tpo $(DEPDIR)/riff.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/helpers/riff.c' object='riff.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT riff.lo -MD -MP -MF $(DEPDIR)/riff.Tpo -c -o riff.lo `test -f 'dumb-kode54/src/helpers/riff.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/riff.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/riff.Tpo $(DEPDIR)/riff.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/helpers/riff.c' object='riff.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o riff.lo `test -f 'dumb-kode54/src/helpers/riff.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/riff.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o riff.lo `test -f 'dumb-kode54/src/helpers/riff.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/riff.c
memfile.lo: dumb-kode54/src/helpers/memfile.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT memfile.lo -MD -MP -MF $(DEPDIR)/memfile.Tpo -c -o memfile.lo `test -f 'dumb-kode54/src/helpers/memfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/memfile.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/memfile.Tpo $(DEPDIR)/memfile.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/helpers/memfile.c' object='memfile.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT memfile.lo -MD -MP -MF $(DEPDIR)/memfile.Tpo -c -o memfile.lo `test -f 'dumb-kode54/src/helpers/memfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/memfile.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/memfile.Tpo $(DEPDIR)/memfile.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/helpers/memfile.c' object='memfile.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memfile.lo `test -f 'dumb-kode54/src/helpers/memfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/memfile.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memfile.lo `test -f 'dumb-kode54/src/helpers/memfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/memfile.c
sampbuf.lo: dumb-kode54/src/helpers/sampbuf.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sampbuf.lo -MD -MP -MF $(DEPDIR)/sampbuf.Tpo -c -o sampbuf.lo `test -f 'dumb-kode54/src/helpers/sampbuf.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/sampbuf.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/sampbuf.Tpo $(DEPDIR)/sampbuf.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/helpers/sampbuf.c' object='sampbuf.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sampbuf.lo -MD -MP -MF $(DEPDIR)/sampbuf.Tpo -c -o sampbuf.lo `test -f 'dumb-kode54/src/helpers/sampbuf.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/sampbuf.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sampbuf.Tpo $(DEPDIR)/sampbuf.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/helpers/sampbuf.c' object='sampbuf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sampbuf.lo `test -f 'dumb-kode54/src/helpers/sampbuf.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/sampbuf.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sampbuf.lo `test -f 'dumb-kode54/src/helpers/sampbuf.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/sampbuf.c
barray.lo: dumb-kode54/src/helpers/barray.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT barray.lo -MD -MP -MF $(DEPDIR)/barray.Tpo -c -o barray.lo `test -f 'dumb-kode54/src/helpers/barray.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/barray.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/barray.Tpo $(DEPDIR)/barray.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dumb-kode54/src/helpers/barray.c' object='barray.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT barray.lo -MD -MP -MF $(DEPDIR)/barray.Tpo -c -o barray.lo `test -f 'dumb-kode54/src/helpers/barray.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/barray.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/barray.Tpo $(DEPDIR)/barray.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dumb-kode54/src/helpers/barray.c' object='barray.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o barray.lo `test -f 'dumb-kode54/src/helpers/barray.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/barray.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o barray.lo `test -f 'dumb-kode54/src/helpers/barray.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/barray.c
mostlyclean-libtool:
-rm -f *.lo
@@@ -1221,26 -1308,15 +1335,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -1252,15 -1328,11 +1355,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -1269,6 -1341,21 +1368,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -1413,19 -1500,20 +1527,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/ffap/Makefile.in
index b4fc387,af7b0cc..502d1e6
--- a/plugins/ffap/Makefile.in
+++ b/plugins/ffap/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/ffap
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -114,23 -142,48 +166,48 @@@ am__ffap_la_SOURCES_DIST = ffap.c dsput
@APE_USE_YASM_TRUE@@HAVE_FFAP_TRUE@@HAVE_YASM_TRUE at am__objects_1 = dsputil_yasm.lo
@HAVE_FFAP_TRUE at am_ffap_la_OBJECTS = ffap.lo $(am__objects_1)
ffap_la_OBJECTS = $(am_ffap_la_OBJECTS)
- ffap_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ffap_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ ffap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(ffap_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_FFAP_TRUE at am_ffap_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(ffap_la_SOURCES)
DIST_SOURCES = $(am__ffap_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -191,23 +215,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -234,7 +261,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -255,12 +282,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -283,7 +310,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -337,7 +364,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -356,8 +383,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -383,17 +410,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -402,9 +429,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -388,7 -471,7 +498,7 @@@ top_srcdir = @top_srcdir
@APE_USE_YASM_TRUE@@HAVE_FFAP_TRUE@@HAVE_YASM_TRUE at INTEL_SRC = dsputil_yasm.asm
@APE_USE_YASM_TRUE@@HAVE_FFAP_TRUE@@HAVE_YASM_TRUE at ffap_la_DEPENDENCIES = dsputil_yasm.lo
@HAVE_FFAP_TRUE at ffap_la_SOURCES = ffap.c $(INTEL_SRC)
- @HAVE_FFAP_TRUE at ffap_la_LDFLAGS = -module -lm
+ @HAVE_FFAP_TRUE at ffap_la_LDFLAGS = -module -avoid-version -lm
@HAVE_FFAP_TRUE at AM_CFLAGS = $(CFLAGS) -fPIC -std=c99
all: all-am
@@@ -424,6 -507,7 +534,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -450,14 -534,17 +561,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
ffap.la: $(ffap_la_OBJECTS) $(ffap_la_DEPENDENCIES) $(EXTRA_ffap_la_DEPENDENCIES)
- $(ffap_la_LINK) $(am_ffap_la_rpath) $(ffap_la_OBJECTS) $(ffap_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(ffap_la_LINK) $(am_ffap_la_rpath) $(ffap_la_OBJECTS) $(ffap_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -468,25 -555,25 +582,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ffap.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -494,26 -581,15 +608,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -525,15 -601,11 +628,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -542,6 -614,21 +641,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -686,19 -773,20 +800,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
@APE_USE_YASM_TRUE@@HAVE_FFAP_TRUE@@HAVE_YASM_TRUE at .asm.lo:
diff --combined plugins/ffmpeg/Makefile.in
index 6f4f0f8,25151ba..020d449
--- a/plugins/ffmpeg/Makefile.in
+++ b/plugins/ffmpeg/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/ffmpeg
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -114,23 -142,48 +166,48 @@@ am__DEPENDENCIES_1
am__ffmpeg_la_SOURCES_DIST = ffmpeg.c
@HAVE_FFMPEG_TRUE at am_ffmpeg_la_OBJECTS = ffmpeg.lo
ffmpeg_la_OBJECTS = $(am_ffmpeg_la_OBJECTS)
- ffmpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ ffmpeg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(ffmpeg_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_FFMPEG_TRUE at am_ffmpeg_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(ffmpeg_la_SOURCES)
DIST_SOURCES = $(am__ffmpeg_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -191,23 +215,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -234,7 +261,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -255,12 +282,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -283,7 +310,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -337,7 +364,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -356,8 +383,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -383,17 +410,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -402,9 +429,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,7 -465,7 +492,7 @@@ top_srcdir = @top_srcdir
@HAVE_FFMPEG_TRUE at ffmpegdir = $(libdir)/$(PACKAGE)
@HAVE_FFMPEG_TRUE at pkglib_LTLIBRARIES = ffmpeg.la
@HAVE_FFMPEG_TRUE at ffmpeg_la_SOURCES = ffmpeg.c
- @HAVE_FFMPEG_TRUE at ffmpeg_la_LDFLAGS = -module
+ @HAVE_FFMPEG_TRUE at ffmpeg_la_LDFLAGS = -module -avoid-version
@HAVE_FFMPEG_TRUE at ffmpeg_la_LIBADD = $(LDADD) $(FFMPEG_DEPS_LIBS)
@HAVE_FFMPEG_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 ${FFMPEG_DEPS_CFLAGS}
all: all-am
@@@ -419,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
ffmpeg.la: $(ffmpeg_la_OBJECTS) $(ffmpeg_la_DEPENDENCIES) $(EXTRA_ffmpeg_la_DEPENDENCIES)
- $(ffmpeg_la_LINK) $(am_ffmpeg_la_rpath) $(ffmpeg_la_OBJECTS) $(ffmpeg_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(ffmpeg_la_LINK) $(am_ffmpeg_la_rpath) $(ffmpeg_la_OBJECTS) $(ffmpeg_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ffmpeg.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/flac/Makefile.in
index 91f7d4c,5ee7ec4..7278c91
--- a/plugins/flac/Makefile.in
+++ b/plugins/flac/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/flac
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -110,27 -138,56 +162,56 @@@ am__uninstall_files_from_dir = {
am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
am__DEPENDENCIES_1 =
- @HAVE_FLAC_TRUE at flac_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ @HAVE_FLAC_TRUE@@HAVE_OGG_TRUE at am__DEPENDENCIES_2 = \
+ @HAVE_FLAC_TRUE@@HAVE_OGG_TRUE@ ../liboggedit/liboggedit.a \
+ @HAVE_FLAC_TRUE@@HAVE_OGG_TRUE@ $(am__DEPENDENCIES_1)
+ @HAVE_FLAC_TRUE at flac_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ @HAVE_FLAC_TRUE@ $(am__DEPENDENCIES_2)
am__flac_la_SOURCES_DIST = flac.c
@HAVE_FLAC_TRUE at am_flac_la_OBJECTS = flac.lo
flac_la_OBJECTS = $(am_flac_la_OBJECTS)
- flac_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(flac_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ flac_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(flac_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_FLAC_TRUE at am_flac_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(flac_la_SOURCES)
DIST_SOURCES = $(am__flac_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -195,23 +219,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -238,7 +265,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -259,12 +286,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -287,7 +314,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -341,7 +368,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -360,8 +387,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -387,17 +414,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -406,9 +433,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,9 -469,11 +496,11 @@@ top_srcdir = @top_srcdir
@HAVE_FLAC_TRUE at flacdir = $(libdir)/$(PACKAGE)
@HAVE_FLAC_TRUE at pkglib_LTLIBRARIES = flac.la
@HAVE_FLAC_TRUE at flac_la_SOURCES = flac.c
- @HAVE_FLAC_TRUE at flac_la_LDFLAGS = -module
- @HAVE_FLAC_TRUE at flac_la_LIBADD = $(LDADD) $(FLAC_LIBS)
- @HAVE_FLAC_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
+ @HAVE_FLAC_TRUE at flac_la_LDFLAGS = -module -avoid-version -export-symbols-regex flac_load
+ @HAVE_FLAC_TRUE@@HAVE_OGG_TRUE at oggedit_def = -DUSE_OGGEDIT=1
+ @HAVE_FLAC_TRUE@@HAVE_OGG_TRUE at oggedit_lib = ../liboggedit/liboggedit.a $(OGG_LIBS)
+ @HAVE_FLAC_TRUE at flac_la_LIBADD = $(LDADD) $(FLAC_LIBS) $(oggedit_lib)
+ @HAVE_FLAC_TRUE at AM_CFLAGS = $(CFLAGS) $(FLAC_CFLAGS) $(oggedit_def) -std=c99
all: all-am
.SUFFIXES:
@@@ -419,6 -508,7 +535,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -535,17 +562,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
flac.la: $(flac_la_OBJECTS) $(flac_la_DEPENDENCIES) $(EXTRA_flac_la_DEPENDENCIES)
- $(flac_la_LINK) $(am_flac_la_rpath) $(flac_la_OBJECTS) $(flac_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(flac_la_LINK) $(am_flac_la_rpath) $(flac_la_OBJECTS) $(flac_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -556,25 +583,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/flac.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -582,15 +609,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -602,11 +629,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -615,21 +642,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -774,20 +801,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/gme/Makefile.in
index b1d5220,77d1622..964fa0e
--- a/plugins/gme/Makefile.in
+++ b/plugins/gme/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/gme
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -245,32 -273,66 +297,66 @@@ am__gme_la_SOURCES_DIST = cgme.c $(gmev
@HAVE_GME_TRUE@ Data_Reader.lo s_deltat.lo s_logtbl.lo s_opl.lo \
@HAVE_GME_TRUE@ s_opltbl.lo ym2413.lo
gme_la_OBJECTS = $(am_gme_la_OBJECTS)
- gme_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(gme_la_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ gme_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(gme_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_GME_TRUE at am_gme_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+ AM_V_CXX = $(am__v_CXX_ at AM_V@)
+ am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+ am__v_CXX_0 = @echo " CXX " $@;
+ am__v_CXX_1 =
CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+ am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+ am__v_CXXLD_0 = @echo " CXXLD " $@;
+ am__v_CXXLD_1 =
SOURCES = $(gme_la_SOURCES)
DIST_SOURCES = $(am__gme_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -278,6 -340,23 +364,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -304,6 -383,7 +410,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -324,10 -404,12 +431,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -350,6 -432,7 +459,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -403,6 -486,7 +513,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -421,6 -505,8 +532,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -446,13 -532,17 +559,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -461,7 -551,9 +578,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -519,11 -611,6 +638,6 @@@ target_alias = @target_alias
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
- #gmeversion=Game_Music_Emu-0.5.2
- #gmeversion=game-music-emu-0.5.5
- #gmeversion=game-music-emu-svn
- #gmeversion=game-music-emu-0.6.0
@HAVE_GME_TRUE at gmeversion = game-music-emu-0.6pre
@HAVE_GME_TRUE at gmepath = @top_srcdir@/plugins/gme/$(gmeversion)
@HAVE_GME_TRUE at EXTRA_DIST = $(gmepath)/changes.txt $(gmepath)/design.txt $(gmepath)/gme.txt $(gmepath)/license.txt $(gmepath)/readme.txt
@@@ -705,220 -792,10 +819,10 @@@
@HAVE_GME_TRUE@ $(gmeversion)/gme/Z80_Cpu.h\
@HAVE_GME_TRUE@ $(gmeversion)/gme/Z80_Cpu_run.h
-
- # 0.6.0 files
- #gme_la_SOURCES = cgme.c\
- # $(gmeversion)/gme/Ay_Apu.cpp\
- # $(gmeversion)/gme/Ay_Cpu.cpp\
- # $(gmeversion)/gme/Ay_Emu.cpp\
- # $(gmeversion)/gme/Blip_Buffer.cpp\
- # $(gmeversion)/gme/Classic_Emu.cpp\
- # $(gmeversion)/gme/Data_Reader.cpp\
- # $(gmeversion)/gme/Dual_Resampler.cpp\
- # $(gmeversion)/gme/Effects_Buffer.cpp\
- # $(gmeversion)/gme/Fir_Resampler.cpp\
- # $(gmeversion)/gme/Gb_Apu.cpp\
- # $(gmeversion)/gme/Gb_Cpu.cpp\
- # $(gmeversion)/gme/Gb_Oscs.cpp\
- # $(gmeversion)/gme/Gbs_Emu.cpp\
- # $(gmeversion)/gme/gme.cpp\
- # $(gmeversion)/gme/Gme_File.cpp\
- # $(gmeversion)/gme/Gym_Emu.cpp\
- # $(gmeversion)/gme/Hes_Apu.cpp\
- # $(gmeversion)/gme/Hes_Cpu.cpp\
- # $(gmeversion)/gme/Hes_Emu.cpp\
- # $(gmeversion)/gme/Kss_Cpu.cpp\
- # $(gmeversion)/gme/Kss_Emu.cpp\
- # $(gmeversion)/gme/Kss_Scc_Apu.cpp\
- # $(gmeversion)/gme/M3u_Playlist.cpp\
- # $(gmeversion)/gme/Multi_Buffer.cpp\
- # $(gmeversion)/gme/Music_Emu.cpp\
- # $(gmeversion)/gme/Nes_Apu.cpp\
- # $(gmeversion)/gme/Nes_Cpu.cpp\
- # $(gmeversion)/gme/Nes_Fme7_Apu.cpp\
- # $(gmeversion)/gme/Nes_Namco_Apu.cpp\
- # $(gmeversion)/gme/Nes_Oscs.cpp\
- # $(gmeversion)/gme/Nes_Vrc6_Apu.cpp\
- # $(gmeversion)/gme/Nsfe_Emu.cpp\
- # $(gmeversion)/gme/Nsf_Emu.cpp\
- # $(gmeversion)/gme/Sap_Apu.cpp\
- # $(gmeversion)/gme/Sap_Cpu.cpp\
- # $(gmeversion)/gme/Sap_Emu.cpp\
- # $(gmeversion)/gme/Sms_Apu.cpp\
- # $(gmeversion)/gme/Snes_Spc.cpp\
- # $(gmeversion)/gme/Spc_Cpu.cpp\
- # $(gmeversion)/gme/Spc_Dsp.cpp\
- # $(gmeversion)/gme/Spc_Emu.cpp\
- # $(gmeversion)/gme/Spc_Filter.cpp\
- # $(gmeversion)/gme/Vgm_Emu.cpp\
- # $(gmeversion)/gme/Vgm_Emu_Impl.cpp\
- # $(gmeversion)/gme/Ym2413_Emu.cpp\
- # $(gmeversion)/gme/Ym2612_Emu.cpp\
- # $(gmeversion)/gme/Ay_Apu.h\
- # $(gmeversion)/gme/Ay_Cpu.h\
- # $(gmeversion)/gme/Ay_Emu.h\
- # $(gmeversion)/gme/blargg_common.h\
- # $(gmeversion)/gme/blargg_config.h\
- # $(gmeversion)/gme/blargg_endian.h\
- # $(gmeversion)/gme/blargg_source.h\
- # $(gmeversion)/gme/Blip_Buffer.h\
- # $(gmeversion)/gme/Classic_Emu.h\
- # $(gmeversion)/gme/Data_Reader.h\
- # $(gmeversion)/gme/Dual_Resampler.h\
- # $(gmeversion)/gme/Effects_Buffer.h\
- # $(gmeversion)/gme/Fir_Resampler.h\
- # $(gmeversion)/gme/Gb_Apu.h\
- # $(gmeversion)/gme/Gb_Cpu.h\
- # $(gmeversion)/gme/gb_cpu_io.h\
- # $(gmeversion)/gme/Gb_Oscs.h\
- # $(gmeversion)/gme/Gbs_Emu.h\
- # $(gmeversion)/gme/Gme_File.h\
- # $(gmeversion)/gme/gme.h\
- # $(gmeversion)/gme/gme_types.h\
- # $(gmeversion)/gme/Gym_Emu.h\
- # $(gmeversion)/gme/Hes_Apu.h\
- # $(gmeversion)/gme/Hes_Cpu.h\
- # $(gmeversion)/gme/hes_cpu_io.h\
- # $(gmeversion)/gme/Hes_Emu.h\
- # $(gmeversion)/gme/Kss_Cpu.h\
- # $(gmeversion)/gme/Kss_Emu.h\
- # $(gmeversion)/gme/Kss_Scc_Apu.h\
- # $(gmeversion)/gme/M3u_Playlist.h\
- # $(gmeversion)/gme/Multi_Buffer.h\
- # $(gmeversion)/gme/Music_Emu.h\
- # $(gmeversion)/gme/Nes_Apu.h\
- # $(gmeversion)/gme/Nes_Cpu.h\
- # $(gmeversion)/gme/nes_cpu_io.h\
- # $(gmeversion)/gme/Nes_Fme7_Apu.h\
- # $(gmeversion)/gme/Nes_Namco_Apu.h\
- # $(gmeversion)/gme/Nes_Oscs.h\
- # $(gmeversion)/gme/Nes_Vrc6_Apu.h\
- # $(gmeversion)/gme/Nsfe_Emu.h\
- # $(gmeversion)/gme/Nsf_Emu.h\
- # $(gmeversion)/gme/Sap_Apu.h\
- # $(gmeversion)/gme/Sap_Cpu.h\
- # $(gmeversion)/gme/sap_cpu_io.h\
- # $(gmeversion)/gme/Sap_Emu.h\
- # $(gmeversion)/gme/Sms_Apu.h\
- # $(gmeversion)/gme/Sms_Oscs.h\
- # $(gmeversion)/gme/Snes_Spc.h\
- # $(gmeversion)/gme/Spc_Cpu.h\
- # $(gmeversion)/gme/Spc_Dsp.h\
- # $(gmeversion)/gme/Spc_Emu.h\
- # $(gmeversion)/gme/Spc_Filter.h\
- # $(gmeversion)/gme/Vgm_Emu.h\
- # $(gmeversion)/gme/Vgm_Emu_Impl.h\
- # $(gmeversion)/gme/Ym2413_Emu.h\
- # $(gmeversion)/gme/Ym2612_Emu.h
-
- # 0.5.2 and 0.5.5 files
- #gme_la_SOURCES = cgme.c\
- # $(gmeversion)/gme/Ay_Apu.cpp\
- # $(gmeversion)/gme/Gb_Apu.cpp\
- # $(gmeversion)/gme/Hes_Emu.cpp\
- # $(gmeversion)/gme/Nes_Fme7_Apu.cpp\
- # $(gmeversion)/gme/Sms_Apu.cpp\
- # $(gmeversion)/gme/Ay_Cpu.cpp\
- # $(gmeversion)/gme/Gb_Cpu.cpp\
- # $(gmeversion)/gme/Kss_Cpu.cpp\
- # $(gmeversion)/gme/Nes_Namco_Apu.cpp\
- # $(gmeversion)/gme/Snes_Spc.cpp\
- # $(gmeversion)/gme/Ay_Emu.cpp\
- # $(gmeversion)/gme/Gb_Oscs.cpp\
- # $(gmeversion)/gme/Kss_Emu.cpp\
- # $(gmeversion)/gme/Nes_Oscs.cpp\
- # $(gmeversion)/gme/Spc_Cpu.cpp\
- # $(gmeversion)/gme/Blip_Buffer.cpp\
- # $(gmeversion)/gme/Gbs_Emu.cpp\
- # $(gmeversion)/gme/Kss_Scc_Apu.cpp\
- # $(gmeversion)/gme/Nes_Vrc6_Apu.cpp\
- # $(gmeversion)/gme/Spc_Dsp.cpp\
- # $(gmeversion)/gme/Classic_Emu.cpp\
- # $(gmeversion)/gme/gme.cpp\
- # $(gmeversion)/gme/M3u_Playlist.cpp\
- # $(gmeversion)/gme/Nsfe_Emu.cpp\
- # $(gmeversion)/gme/Spc_Emu.cpp\
- # $(gmeversion)/gme/Data_Reader.cpp\
- # $(gmeversion)/gme/Gme_File.cpp\
- # $(gmeversion)/gme/Multi_Buffer.cpp\
- # $(gmeversion)/gme/Nsf_Emu.cpp\
- # $(gmeversion)/gme/Vgm_Emu.cpp\
- # $(gmeversion)/gme/Dual_Resampler.cpp\
- # $(gmeversion)/gme/Gym_Emu.cpp\
- # $(gmeversion)/gme/Music_Emu.cpp\
- # $(gmeversion)/gme/Sap_Apu.cpp\
- # $(gmeversion)/gme/Vgm_Emu_Impl.cpp\
- # $(gmeversion)/gme/Effects_Buffer.cpp\
- # $(gmeversion)/gme/Hes_Apu.cpp\
- # $(gmeversion)/gme/Nes_Apu.cpp\
- # $(gmeversion)/gme/Sap_Cpu.cpp\
- # $(gmeversion)/gme/Ym2413_Emu.cpp\
- # $(gmeversion)/gme/Fir_Resampler.cpp\
- # $(gmeversion)/gme/Hes_Cpu.cpp\
- # $(gmeversion)/gme/Nes_Cpu.cpp\
- # $(gmeversion)/gme/Sap_Emu.cpp\
- # $(gmeversion)/gme/Ym2612_Emu.cpp\
- # $(gmeversion)/gme/Ay_Apu.h\
- # $(gmeversion)/gme/Ay_Cpu.h\
- # $(gmeversion)/gme/Ay_Emu.h\
- # $(gmeversion)/gme/blargg_common.h\
- # $(gmeversion)/gme/blargg_config.h\
- # $(gmeversion)/gme/blargg_endian.h\
- # $(gmeversion)/gme/blargg_source.h\
- # $(gmeversion)/gme/Blip_Buffer.h\
- # $(gmeversion)/gme/Classic_Emu.h\
- # $(gmeversion)/gme/Data_Reader.h\
- # $(gmeversion)/gme/Dual_Resampler.h\
- # $(gmeversion)/gme/Effects_Buffer.h\
- # $(gmeversion)/gme/Fir_Resampler.h\
- # $(gmeversion)/gme/Gb_Apu.h\
- # $(gmeversion)/gme/Gb_Cpu.h\
- # $(gmeversion)/gme/gb_cpu_io.h\
- # $(gmeversion)/gme/Gb_Oscs.h\
- # $(gmeversion)/gme/Gbs_Emu.h\
- # $(gmeversion)/gme/Gme_File.h\
- # $(gmeversion)/gme/gme.h\
- # $(gmeversion)/gme/Gym_Emu.h\
- # $(gmeversion)/gme/Hes_Apu.h\
- # $(gmeversion)/gme/Hes_Cpu.h\
- # $(gmeversion)/gme/hes_cpu_io.h\
- # $(gmeversion)/gme/Hes_Emu.h\
- # $(gmeversion)/gme/Kss_Cpu.h\
- # $(gmeversion)/gme/Kss_Emu.h\
- # $(gmeversion)/gme/Kss_Scc_Apu.h\
- # $(gmeversion)/gme/M3u_Playlist.h\
- # $(gmeversion)/gme/Multi_Buffer.h\
- # $(gmeversion)/gme/Music_Emu.h\
- # $(gmeversion)/gme/Nes_Apu.h\
- # $(gmeversion)/gme/Nes_Cpu.h\
- # $(gmeversion)/gme/nes_cpu_io.h\
- # $(gmeversion)/gme/Nes_Fme7_Apu.h\
- # $(gmeversion)/gme/Nes_Namco_Apu.h\
- # $(gmeversion)/gme/Nes_Oscs.h\
- # $(gmeversion)/gme/Nes_Vrc6_Apu.h\
- # $(gmeversion)/gme/Nsfe_Emu.h\
- # $(gmeversion)/gme/Nsf_Emu.h\
- # $(gmeversion)/gme/Sap_Apu.h\
- # $(gmeversion)/gme/Sap_Cpu.h\
- # $(gmeversion)/gme/sap_cpu_io.h\
- # $(gmeversion)/gme/Sap_Emu.h\
- # $(gmeversion)/gme/Sms_Apu.h\
- # $(gmeversion)/gme/Sms_Oscs.h\
- # $(gmeversion)/gme/Snes_Spc.h\
- # $(gmeversion)/gme/Spc_Cpu.h\
- # $(gmeversion)/gme/Spc_Dsp.h\
- # $(gmeversion)/gme/Spc_Emu.h\
- # $(gmeversion)/gme/Vgm_Emu.h\
- # $(gmeversion)/gme/Vgm_Emu_Impl.h\
- # $(gmeversion)/gme/Ym2413_Emu.h\
- # $(gmeversion)/gme/Ym2612_Emu.h\
- # $(gmeversion)/gme/gme_types.h\
- # $(gmeversion)/gme/Spc_Filter.cpp\
- # $(gmeversion)/gme/Spc_Filter.h
- @HAVE_GME_TRUE at gme_la_LDFLAGS = -module $(NOCPPLIB)
+ @HAVE_GME_TRUE at gme_la_LDFLAGS = -module -avoid-version $(NOCPPLIB)
@HAVE_GME_TRUE at gme_la_LIBADD = $(ZLIB_LIBS)
@HAVE_GME_TRUE at AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -I$(gmepath) -std=c99 -DGME_VERSION_055
- @HAVE_GME_TRUE at AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -nostdlib -fno-unwind-tables
+ @HAVE_GME_TRUE at AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fno-unwind-tables
all: all-am
.SUFFIXES:
@@@ -953,6 -830,7 +857,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -979,14 -857,17 +884,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
gme.la: $(gme_la_OBJECTS) $(gme_la_DEPENDENCIES) $(EXTRA_gme_la_DEPENDENCIES)
- $(gme_la_LINK) $(am_gme_la_rpath) $(gme_la_OBJECTS) $(gme_la_LIBADD) $(LIBS)
+ $(AM_V_CXXLD)$(gme_la_LINK) $(am_gme_la_rpath) $(gme_la_OBJECTS) $(gme_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -1078,613 -959,613 +986,613 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ymdeltat.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
s_deltat.lo: $(gmeversion)/gme/s_deltat.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_deltat.lo -MD -MP -MF $(DEPDIR)/s_deltat.Tpo -c -o s_deltat.lo `test -f '$(gmeversion)/gme/s_deltat.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_deltat.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/s_deltat.Tpo $(DEPDIR)/s_deltat.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(gmeversion)/gme/s_deltat.c' object='s_deltat.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_deltat.lo -MD -MP -MF $(DEPDIR)/s_deltat.Tpo -c -o s_deltat.lo `test -f '$(gmeversion)/gme/s_deltat.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_deltat.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/s_deltat.Tpo $(DEPDIR)/s_deltat.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(gmeversion)/gme/s_deltat.c' object='s_deltat.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_deltat.lo `test -f '$(gmeversion)/gme/s_deltat.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_deltat.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_deltat.lo `test -f '$(gmeversion)/gme/s_deltat.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_deltat.c
s_logtbl.lo: $(gmeversion)/gme/s_logtbl.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_logtbl.lo -MD -MP -MF $(DEPDIR)/s_logtbl.Tpo -c -o s_logtbl.lo `test -f '$(gmeversion)/gme/s_logtbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_logtbl.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/s_logtbl.Tpo $(DEPDIR)/s_logtbl.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(gmeversion)/gme/s_logtbl.c' object='s_logtbl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_logtbl.lo -MD -MP -MF $(DEPDIR)/s_logtbl.Tpo -c -o s_logtbl.lo `test -f '$(gmeversion)/gme/s_logtbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_logtbl.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/s_logtbl.Tpo $(DEPDIR)/s_logtbl.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(gmeversion)/gme/s_logtbl.c' object='s_logtbl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_logtbl.lo `test -f '$(gmeversion)/gme/s_logtbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_logtbl.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_logtbl.lo `test -f '$(gmeversion)/gme/s_logtbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_logtbl.c
s_opl.lo: $(gmeversion)/gme/s_opl.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_opl.lo -MD -MP -MF $(DEPDIR)/s_opl.Tpo -c -o s_opl.lo `test -f '$(gmeversion)/gme/s_opl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opl.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/s_opl.Tpo $(DEPDIR)/s_opl.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(gmeversion)/gme/s_opl.c' object='s_opl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_opl.lo -MD -MP -MF $(DEPDIR)/s_opl.Tpo -c -o s_opl.lo `test -f '$(gmeversion)/gme/s_opl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opl.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/s_opl.Tpo $(DEPDIR)/s_opl.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(gmeversion)/gme/s_opl.c' object='s_opl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_opl.lo `test -f '$(gmeversion)/gme/s_opl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opl.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_opl.lo `test -f '$(gmeversion)/gme/s_opl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opl.c
s_opltbl.lo: $(gmeversion)/gme/s_opltbl.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_opltbl.lo -MD -MP -MF $(DEPDIR)/s_opltbl.Tpo -c -o s_opltbl.lo `test -f '$(gmeversion)/gme/s_opltbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opltbl.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/s_opltbl.Tpo $(DEPDIR)/s_opltbl.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(gmeversion)/gme/s_opltbl.c' object='s_opltbl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT s_opltbl.lo -MD -MP -MF $(DEPDIR)/s_opltbl.Tpo -c -o s_opltbl.lo `test -f '$(gmeversion)/gme/s_opltbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opltbl.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/s_opltbl.Tpo $(DEPDIR)/s_opltbl.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(gmeversion)/gme/s_opltbl.c' object='s_opltbl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_opltbl.lo `test -f '$(gmeversion)/gme/s_opltbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opltbl.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_opltbl.lo `test -f '$(gmeversion)/gme/s_opltbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opltbl.c
ym2413.lo: $(gmeversion)/gme/ym2413.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ym2413.lo -MD -MP -MF $(DEPDIR)/ym2413.Tpo -c -o ym2413.lo `test -f '$(gmeversion)/gme/ym2413.c' || echo '$(srcdir)/'`$(gmeversion)/gme/ym2413.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ym2413.Tpo $(DEPDIR)/ym2413.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(gmeversion)/gme/ym2413.c' object='ym2413.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ym2413.lo -MD -MP -MF $(DEPDIR)/ym2413.Tpo -c -o ym2413.lo `test -f '$(gmeversion)/gme/ym2413.c' || echo '$(srcdir)/'`$(gmeversion)/gme/ym2413.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ym2413.Tpo $(DEPDIR)/ym2413.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(gmeversion)/gme/ym2413.c' object='ym2413.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ym2413.lo `test -f '$(gmeversion)/gme/ym2413.c' || echo '$(srcdir)/'`$(gmeversion)/gme/ym2413.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ym2413.lo `test -f '$(gmeversion)/gme/ym2413.c' || echo '$(srcdir)/'`$(gmeversion)/gme/ym2413.c
.cpp.o:
- @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cpp.obj:
- @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cpp.lo:
- @am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
Ay_Apu.lo: $(gmeversion)/gme/Ay_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Apu.lo -MD -MP -MF $(DEPDIR)/Ay_Apu.Tpo -c -o Ay_Apu.lo `test -f '$(gmeversion)/gme/Ay_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Ay_Apu.Tpo $(DEPDIR)/Ay_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Ay_Apu.cpp' object='Ay_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Apu.lo -MD -MP -MF $(DEPDIR)/Ay_Apu.Tpo -c -o Ay_Apu.lo `test -f '$(gmeversion)/gme/Ay_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Ay_Apu.Tpo $(DEPDIR)/Ay_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Ay_Apu.cpp' object='Ay_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Apu.lo `test -f '$(gmeversion)/gme/Ay_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Apu.lo `test -f '$(gmeversion)/gme/Ay_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Apu.cpp
Ay_Core.lo: $(gmeversion)/gme/Ay_Core.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Core.lo -MD -MP -MF $(DEPDIR)/Ay_Core.Tpo -c -o Ay_Core.lo `test -f '$(gmeversion)/gme/Ay_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Core.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Ay_Core.Tpo $(DEPDIR)/Ay_Core.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Ay_Core.cpp' object='Ay_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Core.lo -MD -MP -MF $(DEPDIR)/Ay_Core.Tpo -c -o Ay_Core.lo `test -f '$(gmeversion)/gme/Ay_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Core.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Ay_Core.Tpo $(DEPDIR)/Ay_Core.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Ay_Core.cpp' object='Ay_Core.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Core.lo `test -f '$(gmeversion)/gme/Ay_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Core.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Core.lo `test -f '$(gmeversion)/gme/Ay_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Core.cpp
Ay_Cpu.lo: $(gmeversion)/gme/Ay_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Cpu.lo -MD -MP -MF $(DEPDIR)/Ay_Cpu.Tpo -c -o Ay_Cpu.lo `test -f '$(gmeversion)/gme/Ay_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Ay_Cpu.Tpo $(DEPDIR)/Ay_Cpu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Ay_Cpu.cpp' object='Ay_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Cpu.lo -MD -MP -MF $(DEPDIR)/Ay_Cpu.Tpo -c -o Ay_Cpu.lo `test -f '$(gmeversion)/gme/Ay_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Cpu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Ay_Cpu.Tpo $(DEPDIR)/Ay_Cpu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Ay_Cpu.cpp' object='Ay_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Cpu.lo `test -f '$(gmeversion)/gme/Ay_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Cpu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Cpu.lo `test -f '$(gmeversion)/gme/Ay_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Cpu.cpp
Ay_Emu.lo: $(gmeversion)/gme/Ay_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Emu.lo -MD -MP -MF $(DEPDIR)/Ay_Emu.Tpo -c -o Ay_Emu.lo `test -f '$(gmeversion)/gme/Ay_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Ay_Emu.Tpo $(DEPDIR)/Ay_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Ay_Emu.cpp' object='Ay_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Emu.lo -MD -MP -MF $(DEPDIR)/Ay_Emu.Tpo -c -o Ay_Emu.lo `test -f '$(gmeversion)/gme/Ay_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Ay_Emu.Tpo $(DEPDIR)/Ay_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Ay_Emu.cpp' object='Ay_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Emu.lo `test -f '$(gmeversion)/gme/Ay_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Emu.lo `test -f '$(gmeversion)/gme/Ay_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Emu.cpp
blargg_common.lo: $(gmeversion)/gme/blargg_common.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT blargg_common.lo -MD -MP -MF $(DEPDIR)/blargg_common.Tpo -c -o blargg_common.lo `test -f '$(gmeversion)/gme/blargg_common.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_common.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/blargg_common.Tpo $(DEPDIR)/blargg_common.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/blargg_common.cpp' object='blargg_common.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT blargg_common.lo -MD -MP -MF $(DEPDIR)/blargg_common.Tpo -c -o blargg_common.lo `test -f '$(gmeversion)/gme/blargg_common.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_common.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/blargg_common.Tpo $(DEPDIR)/blargg_common.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/blargg_common.cpp' object='blargg_common.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o blargg_common.lo `test -f '$(gmeversion)/gme/blargg_common.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_common.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o blargg_common.lo `test -f '$(gmeversion)/gme/blargg_common.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_common.cpp
blargg_errors.lo: $(gmeversion)/gme/blargg_errors.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT blargg_errors.lo -MD -MP -MF $(DEPDIR)/blargg_errors.Tpo -c -o blargg_errors.lo `test -f '$(gmeversion)/gme/blargg_errors.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_errors.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/blargg_errors.Tpo $(DEPDIR)/blargg_errors.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/blargg_errors.cpp' object='blargg_errors.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT blargg_errors.lo -MD -MP -MF $(DEPDIR)/blargg_errors.Tpo -c -o blargg_errors.lo `test -f '$(gmeversion)/gme/blargg_errors.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_errors.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/blargg_errors.Tpo $(DEPDIR)/blargg_errors.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/blargg_errors.cpp' object='blargg_errors.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o blargg_errors.lo `test -f '$(gmeversion)/gme/blargg_errors.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_errors.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o blargg_errors.lo `test -f '$(gmeversion)/gme/blargg_errors.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_errors.cpp
Blip_Buffer.lo: $(gmeversion)/gme/Blip_Buffer.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Blip_Buffer.lo -MD -MP -MF $(DEPDIR)/Blip_Buffer.Tpo -c -o Blip_Buffer.lo `test -f '$(gmeversion)/gme/Blip_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Blip_Buffer.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Blip_Buffer.Tpo $(DEPDIR)/Blip_Buffer.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Blip_Buffer.cpp' object='Blip_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Blip_Buffer.lo -MD -MP -MF $(DEPDIR)/Blip_Buffer.Tpo -c -o Blip_Buffer.lo `test -f '$(gmeversion)/gme/Blip_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Blip_Buffer.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Blip_Buffer.Tpo $(DEPDIR)/Blip_Buffer.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Blip_Buffer.cpp' object='Blip_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Blip_Buffer.lo `test -f '$(gmeversion)/gme/Blip_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Blip_Buffer.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Blip_Buffer.lo `test -f '$(gmeversion)/gme/Blip_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Blip_Buffer.cpp
Classic_Emu.lo: $(gmeversion)/gme/Classic_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Classic_Emu.lo -MD -MP -MF $(DEPDIR)/Classic_Emu.Tpo -c -o Classic_Emu.lo `test -f '$(gmeversion)/gme/Classic_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Classic_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Classic_Emu.Tpo $(DEPDIR)/Classic_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Classic_Emu.cpp' object='Classic_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Classic_Emu.lo -MD -MP -MF $(DEPDIR)/Classic_Emu.Tpo -c -o Classic_Emu.lo `test -f '$(gmeversion)/gme/Classic_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Classic_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Classic_Emu.Tpo $(DEPDIR)/Classic_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Classic_Emu.cpp' object='Classic_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Classic_Emu.lo `test -f '$(gmeversion)/gme/Classic_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Classic_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Classic_Emu.lo `test -f '$(gmeversion)/gme/Classic_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Classic_Emu.cpp
Downsampler.lo: $(gmeversion)/gme/Downsampler.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Downsampler.lo -MD -MP -MF $(DEPDIR)/Downsampler.Tpo -c -o Downsampler.lo `test -f '$(gmeversion)/gme/Downsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Downsampler.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Downsampler.Tpo $(DEPDIR)/Downsampler.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Downsampler.cpp' object='Downsampler.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Downsampler.lo -MD -MP -MF $(DEPDIR)/Downsampler.Tpo -c -o Downsampler.lo `test -f '$(gmeversion)/gme/Downsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Downsampler.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Downsampler.Tpo $(DEPDIR)/Downsampler.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Downsampler.cpp' object='Downsampler.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Downsampler.lo `test -f '$(gmeversion)/gme/Downsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Downsampler.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Downsampler.lo `test -f '$(gmeversion)/gme/Downsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Downsampler.cpp
Dual_Resampler.lo: $(gmeversion)/gme/Dual_Resampler.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Dual_Resampler.lo -MD -MP -MF $(DEPDIR)/Dual_Resampler.Tpo -c -o Dual_Resampler.lo `test -f '$(gmeversion)/gme/Dual_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Dual_Resampler.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Dual_Resampler.Tpo $(DEPDIR)/Dual_Resampler.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Dual_Resampler.cpp' object='Dual_Resampler.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Dual_Resampler.lo -MD -MP -MF $(DEPDIR)/Dual_Resampler.Tpo -c -o Dual_Resampler.lo `test -f '$(gmeversion)/gme/Dual_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Dual_Resampler.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Dual_Resampler.Tpo $(DEPDIR)/Dual_Resampler.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Dual_Resampler.cpp' object='Dual_Resampler.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Dual_Resampler.lo `test -f '$(gmeversion)/gme/Dual_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Dual_Resampler.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Dual_Resampler.lo `test -f '$(gmeversion)/gme/Dual_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Dual_Resampler.cpp
Effects_Buffer.lo: $(gmeversion)/gme/Effects_Buffer.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Effects_Buffer.lo -MD -MP -MF $(DEPDIR)/Effects_Buffer.Tpo -c -o Effects_Buffer.lo `test -f '$(gmeversion)/gme/Effects_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Effects_Buffer.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Effects_Buffer.Tpo $(DEPDIR)/Effects_Buffer.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Effects_Buffer.cpp' object='Effects_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Effects_Buffer.lo -MD -MP -MF $(DEPDIR)/Effects_Buffer.Tpo -c -o Effects_Buffer.lo `test -f '$(gmeversion)/gme/Effects_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Effects_Buffer.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Effects_Buffer.Tpo $(DEPDIR)/Effects_Buffer.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Effects_Buffer.cpp' object='Effects_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Effects_Buffer.lo `test -f '$(gmeversion)/gme/Effects_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Effects_Buffer.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Effects_Buffer.lo `test -f '$(gmeversion)/gme/Effects_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Effects_Buffer.cpp
emu2413.lo: $(gmeversion)/gme/emu2413.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT emu2413.lo -MD -MP -MF $(DEPDIR)/emu2413.Tpo -c -o emu2413.lo `test -f '$(gmeversion)/gme/emu2413.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/emu2413.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/emu2413.Tpo $(DEPDIR)/emu2413.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/emu2413.cpp' object='emu2413.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT emu2413.lo -MD -MP -MF $(DEPDIR)/emu2413.Tpo -c -o emu2413.lo `test -f '$(gmeversion)/gme/emu2413.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/emu2413.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/emu2413.Tpo $(DEPDIR)/emu2413.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/emu2413.cpp' object='emu2413.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o emu2413.lo `test -f '$(gmeversion)/gme/emu2413.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/emu2413.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o emu2413.lo `test -f '$(gmeversion)/gme/emu2413.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/emu2413.cpp
Fir_Resampler.lo: $(gmeversion)/gme/Fir_Resampler.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Fir_Resampler.lo -MD -MP -MF $(DEPDIR)/Fir_Resampler.Tpo -c -o Fir_Resampler.lo `test -f '$(gmeversion)/gme/Fir_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Fir_Resampler.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Fir_Resampler.Tpo $(DEPDIR)/Fir_Resampler.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Fir_Resampler.cpp' object='Fir_Resampler.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Fir_Resampler.lo -MD -MP -MF $(DEPDIR)/Fir_Resampler.Tpo -c -o Fir_Resampler.lo `test -f '$(gmeversion)/gme/Fir_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Fir_Resampler.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Fir_Resampler.Tpo $(DEPDIR)/Fir_Resampler.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Fir_Resampler.cpp' object='Fir_Resampler.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Fir_Resampler.lo `test -f '$(gmeversion)/gme/Fir_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Fir_Resampler.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Fir_Resampler.lo `test -f '$(gmeversion)/gme/Fir_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Fir_Resampler.cpp
fmopl.lo: $(gmeversion)/gme/fmopl.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fmopl.lo -MD -MP -MF $(DEPDIR)/fmopl.Tpo -c -o fmopl.lo `test -f '$(gmeversion)/gme/fmopl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/fmopl.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/fmopl.Tpo $(DEPDIR)/fmopl.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/fmopl.cpp' object='fmopl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fmopl.lo -MD -MP -MF $(DEPDIR)/fmopl.Tpo -c -o fmopl.lo `test -f '$(gmeversion)/gme/fmopl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/fmopl.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fmopl.Tpo $(DEPDIR)/fmopl.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/fmopl.cpp' object='fmopl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fmopl.lo `test -f '$(gmeversion)/gme/fmopl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/fmopl.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fmopl.lo `test -f '$(gmeversion)/gme/fmopl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/fmopl.cpp
Gb_Apu.lo: $(gmeversion)/gme/Gb_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Apu.lo -MD -MP -MF $(DEPDIR)/Gb_Apu.Tpo -c -o Gb_Apu.lo `test -f '$(gmeversion)/gme/Gb_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Gb_Apu.Tpo $(DEPDIR)/Gb_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Gb_Apu.cpp' object='Gb_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Apu.lo -MD -MP -MF $(DEPDIR)/Gb_Apu.Tpo -c -o Gb_Apu.lo `test -f '$(gmeversion)/gme/Gb_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Gb_Apu.Tpo $(DEPDIR)/Gb_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Gb_Apu.cpp' object='Gb_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Apu.lo `test -f '$(gmeversion)/gme/Gb_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Apu.lo `test -f '$(gmeversion)/gme/Gb_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Apu.cpp
Gb_Cpu.lo: $(gmeversion)/gme/Gb_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Cpu.lo -MD -MP -MF $(DEPDIR)/Gb_Cpu.Tpo -c -o Gb_Cpu.lo `test -f '$(gmeversion)/gme/Gb_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Gb_Cpu.Tpo $(DEPDIR)/Gb_Cpu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Gb_Cpu.cpp' object='Gb_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Cpu.lo -MD -MP -MF $(DEPDIR)/Gb_Cpu.Tpo -c -o Gb_Cpu.lo `test -f '$(gmeversion)/gme/Gb_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Cpu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Gb_Cpu.Tpo $(DEPDIR)/Gb_Cpu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Gb_Cpu.cpp' object='Gb_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Cpu.lo `test -f '$(gmeversion)/gme/Gb_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Cpu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Cpu.lo `test -f '$(gmeversion)/gme/Gb_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Cpu.cpp
Gb_Oscs.lo: $(gmeversion)/gme/Gb_Oscs.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Oscs.lo -MD -MP -MF $(DEPDIR)/Gb_Oscs.Tpo -c -o Gb_Oscs.lo `test -f '$(gmeversion)/gme/Gb_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Oscs.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Gb_Oscs.Tpo $(DEPDIR)/Gb_Oscs.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Gb_Oscs.cpp' object='Gb_Oscs.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Oscs.lo -MD -MP -MF $(DEPDIR)/Gb_Oscs.Tpo -c -o Gb_Oscs.lo `test -f '$(gmeversion)/gme/Gb_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Oscs.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Gb_Oscs.Tpo $(DEPDIR)/Gb_Oscs.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Gb_Oscs.cpp' object='Gb_Oscs.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Oscs.lo `test -f '$(gmeversion)/gme/Gb_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Oscs.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Oscs.lo `test -f '$(gmeversion)/gme/Gb_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Oscs.cpp
Gbs_Core.lo: $(gmeversion)/gme/Gbs_Core.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Core.lo -MD -MP -MF $(DEPDIR)/Gbs_Core.Tpo -c -o Gbs_Core.lo `test -f '$(gmeversion)/gme/Gbs_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Core.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Gbs_Core.Tpo $(DEPDIR)/Gbs_Core.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Gbs_Core.cpp' object='Gbs_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Core.lo -MD -MP -MF $(DEPDIR)/Gbs_Core.Tpo -c -o Gbs_Core.lo `test -f '$(gmeversion)/gme/Gbs_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Core.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Gbs_Core.Tpo $(DEPDIR)/Gbs_Core.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Gbs_Core.cpp' object='Gbs_Core.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Core.lo `test -f '$(gmeversion)/gme/Gbs_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Core.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Core.lo `test -f '$(gmeversion)/gme/Gbs_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Core.cpp
Gbs_Cpu.lo: $(gmeversion)/gme/Gbs_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Cpu.lo -MD -MP -MF $(DEPDIR)/Gbs_Cpu.Tpo -c -o Gbs_Cpu.lo `test -f '$(gmeversion)/gme/Gbs_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Gbs_Cpu.Tpo $(DEPDIR)/Gbs_Cpu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Gbs_Cpu.cpp' object='Gbs_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Cpu.lo -MD -MP -MF $(DEPDIR)/Gbs_Cpu.Tpo -c -o Gbs_Cpu.lo `test -f '$(gmeversion)/gme/Gbs_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Cpu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Gbs_Cpu.Tpo $(DEPDIR)/Gbs_Cpu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Gbs_Cpu.cpp' object='Gbs_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Cpu.lo `test -f '$(gmeversion)/gme/Gbs_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Cpu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Cpu.lo `test -f '$(gmeversion)/gme/Gbs_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Cpu.cpp
Gbs_Emu.lo: $(gmeversion)/gme/Gbs_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Emu.lo -MD -MP -MF $(DEPDIR)/Gbs_Emu.Tpo -c -o Gbs_Emu.lo `test -f '$(gmeversion)/gme/Gbs_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Gbs_Emu.Tpo $(DEPDIR)/Gbs_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Gbs_Emu.cpp' object='Gbs_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Emu.lo -MD -MP -MF $(DEPDIR)/Gbs_Emu.Tpo -c -o Gbs_Emu.lo `test -f '$(gmeversion)/gme/Gbs_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Gbs_Emu.Tpo $(DEPDIR)/Gbs_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Gbs_Emu.cpp' object='Gbs_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Emu.lo `test -f '$(gmeversion)/gme/Gbs_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Emu.lo `test -f '$(gmeversion)/gme/Gbs_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Emu.cpp
gme.lo: $(gmeversion)/gme/gme.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gme.lo -MD -MP -MF $(DEPDIR)/gme.Tpo -c -o gme.lo `test -f '$(gmeversion)/gme/gme.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/gme.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gme.Tpo $(DEPDIR)/gme.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/gme.cpp' object='gme.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gme.lo -MD -MP -MF $(DEPDIR)/gme.Tpo -c -o gme.lo `test -f '$(gmeversion)/gme/gme.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/gme.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gme.Tpo $(DEPDIR)/gme.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/gme.cpp' object='gme.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gme.lo `test -f '$(gmeversion)/gme/gme.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/gme.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gme.lo `test -f '$(gmeversion)/gme/gme.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/gme.cpp
Gme_File.lo: $(gmeversion)/gme/Gme_File.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gme_File.lo -MD -MP -MF $(DEPDIR)/Gme_File.Tpo -c -o Gme_File.lo `test -f '$(gmeversion)/gme/Gme_File.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_File.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Gme_File.Tpo $(DEPDIR)/Gme_File.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Gme_File.cpp' object='Gme_File.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gme_File.lo -MD -MP -MF $(DEPDIR)/Gme_File.Tpo -c -o Gme_File.lo `test -f '$(gmeversion)/gme/Gme_File.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_File.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Gme_File.Tpo $(DEPDIR)/Gme_File.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Gme_File.cpp' object='Gme_File.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gme_File.lo `test -f '$(gmeversion)/gme/Gme_File.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_File.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gme_File.lo `test -f '$(gmeversion)/gme/Gme_File.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_File.cpp
Gme_Loader.lo: $(gmeversion)/gme/Gme_Loader.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gme_Loader.lo -MD -MP -MF $(DEPDIR)/Gme_Loader.Tpo -c -o Gme_Loader.lo `test -f '$(gmeversion)/gme/Gme_Loader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_Loader.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Gme_Loader.Tpo $(DEPDIR)/Gme_Loader.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Gme_Loader.cpp' object='Gme_Loader.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gme_Loader.lo -MD -MP -MF $(DEPDIR)/Gme_Loader.Tpo -c -o Gme_Loader.lo `test -f '$(gmeversion)/gme/Gme_Loader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_Loader.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Gme_Loader.Tpo $(DEPDIR)/Gme_Loader.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Gme_Loader.cpp' object='Gme_Loader.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gme_Loader.lo `test -f '$(gmeversion)/gme/Gme_Loader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_Loader.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gme_Loader.lo `test -f '$(gmeversion)/gme/Gme_Loader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_Loader.cpp
Gym_Emu.lo: $(gmeversion)/gme/Gym_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gym_Emu.lo -MD -MP -MF $(DEPDIR)/Gym_Emu.Tpo -c -o Gym_Emu.lo `test -f '$(gmeversion)/gme/Gym_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gym_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Gym_Emu.Tpo $(DEPDIR)/Gym_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Gym_Emu.cpp' object='Gym_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gym_Emu.lo -MD -MP -MF $(DEPDIR)/Gym_Emu.Tpo -c -o Gym_Emu.lo `test -f '$(gmeversion)/gme/Gym_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gym_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Gym_Emu.Tpo $(DEPDIR)/Gym_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Gym_Emu.cpp' object='Gym_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gym_Emu.lo `test -f '$(gmeversion)/gme/Gym_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gym_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gym_Emu.lo `test -f '$(gmeversion)/gme/Gym_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gym_Emu.cpp
Hes_Apu_Adpcm.lo: $(gmeversion)/gme/Hes_Apu_Adpcm.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Apu_Adpcm.lo -MD -MP -MF $(DEPDIR)/Hes_Apu_Adpcm.Tpo -c -o Hes_Apu_Adpcm.lo `test -f '$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu_Adpcm.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Hes_Apu_Adpcm.Tpo $(DEPDIR)/Hes_Apu_Adpcm.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' object='Hes_Apu_Adpcm.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Apu_Adpcm.lo -MD -MP -MF $(DEPDIR)/Hes_Apu_Adpcm.Tpo -c -o Hes_Apu_Adpcm.lo `test -f '$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu_Adpcm.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Apu_Adpcm.Tpo $(DEPDIR)/Hes_Apu_Adpcm.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' object='Hes_Apu_Adpcm.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Apu_Adpcm.lo `test -f '$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu_Adpcm.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Apu_Adpcm.lo `test -f '$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu_Adpcm.cpp
Hes_Apu.lo: $(gmeversion)/gme/Hes_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Apu.lo -MD -MP -MF $(DEPDIR)/Hes_Apu.Tpo -c -o Hes_Apu.lo `test -f '$(gmeversion)/gme/Hes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Hes_Apu.Tpo $(DEPDIR)/Hes_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Hes_Apu.cpp' object='Hes_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Apu.lo -MD -MP -MF $(DEPDIR)/Hes_Apu.Tpo -c -o Hes_Apu.lo `test -f '$(gmeversion)/gme/Hes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Apu.Tpo $(DEPDIR)/Hes_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Hes_Apu.cpp' object='Hes_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Apu.lo `test -f '$(gmeversion)/gme/Hes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Apu.lo `test -f '$(gmeversion)/gme/Hes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu.cpp
Hes_Core.lo: $(gmeversion)/gme/Hes_Core.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Core.lo -MD -MP -MF $(DEPDIR)/Hes_Core.Tpo -c -o Hes_Core.lo `test -f '$(gmeversion)/gme/Hes_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Core.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Hes_Core.Tpo $(DEPDIR)/Hes_Core.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Hes_Core.cpp' object='Hes_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Core.lo -MD -MP -MF $(DEPDIR)/Hes_Core.Tpo -c -o Hes_Core.lo `test -f '$(gmeversion)/gme/Hes_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Core.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Core.Tpo $(DEPDIR)/Hes_Core.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Hes_Core.cpp' object='Hes_Core.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Core.lo `test -f '$(gmeversion)/gme/Hes_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Core.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Core.lo `test -f '$(gmeversion)/gme/Hes_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Core.cpp
Hes_Cpu.lo: $(gmeversion)/gme/Hes_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Cpu.lo -MD -MP -MF $(DEPDIR)/Hes_Cpu.Tpo -c -o Hes_Cpu.lo `test -f '$(gmeversion)/gme/Hes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Hes_Cpu.Tpo $(DEPDIR)/Hes_Cpu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Hes_Cpu.cpp' object='Hes_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Cpu.lo -MD -MP -MF $(DEPDIR)/Hes_Cpu.Tpo -c -o Hes_Cpu.lo `test -f '$(gmeversion)/gme/Hes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Cpu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Cpu.Tpo $(DEPDIR)/Hes_Cpu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Hes_Cpu.cpp' object='Hes_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Cpu.lo `test -f '$(gmeversion)/gme/Hes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Cpu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Cpu.lo `test -f '$(gmeversion)/gme/Hes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Cpu.cpp
Hes_Emu.lo: $(gmeversion)/gme/Hes_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Emu.lo -MD -MP -MF $(DEPDIR)/Hes_Emu.Tpo -c -o Hes_Emu.lo `test -f '$(gmeversion)/gme/Hes_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Hes_Emu.Tpo $(DEPDIR)/Hes_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Hes_Emu.cpp' object='Hes_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Emu.lo -MD -MP -MF $(DEPDIR)/Hes_Emu.Tpo -c -o Hes_Emu.lo `test -f '$(gmeversion)/gme/Hes_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Emu.Tpo $(DEPDIR)/Hes_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Hes_Emu.cpp' object='Hes_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Emu.lo `test -f '$(gmeversion)/gme/Hes_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Emu.lo `test -f '$(gmeversion)/gme/Hes_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Emu.cpp
Kss_Core.lo: $(gmeversion)/gme/Kss_Core.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Core.lo -MD -MP -MF $(DEPDIR)/Kss_Core.Tpo -c -o Kss_Core.lo `test -f '$(gmeversion)/gme/Kss_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Core.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Kss_Core.Tpo $(DEPDIR)/Kss_Core.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Kss_Core.cpp' object='Kss_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Core.lo -MD -MP -MF $(DEPDIR)/Kss_Core.Tpo -c -o Kss_Core.lo `test -f '$(gmeversion)/gme/Kss_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Core.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Kss_Core.Tpo $(DEPDIR)/Kss_Core.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Kss_Core.cpp' object='Kss_Core.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Core.lo `test -f '$(gmeversion)/gme/Kss_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Core.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Core.lo `test -f '$(gmeversion)/gme/Kss_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Core.cpp
Kss_Cpu.lo: $(gmeversion)/gme/Kss_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Cpu.lo -MD -MP -MF $(DEPDIR)/Kss_Cpu.Tpo -c -o Kss_Cpu.lo `test -f '$(gmeversion)/gme/Kss_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Kss_Cpu.Tpo $(DEPDIR)/Kss_Cpu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Kss_Cpu.cpp' object='Kss_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Cpu.lo -MD -MP -MF $(DEPDIR)/Kss_Cpu.Tpo -c -o Kss_Cpu.lo `test -f '$(gmeversion)/gme/Kss_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Cpu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Kss_Cpu.Tpo $(DEPDIR)/Kss_Cpu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Kss_Cpu.cpp' object='Kss_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Cpu.lo `test -f '$(gmeversion)/gme/Kss_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Cpu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Cpu.lo `test -f '$(gmeversion)/gme/Kss_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Cpu.cpp
Kss_Emu.lo: $(gmeversion)/gme/Kss_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Emu.lo -MD -MP -MF $(DEPDIR)/Kss_Emu.Tpo -c -o Kss_Emu.lo `test -f '$(gmeversion)/gme/Kss_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Kss_Emu.Tpo $(DEPDIR)/Kss_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Kss_Emu.cpp' object='Kss_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Emu.lo -MD -MP -MF $(DEPDIR)/Kss_Emu.Tpo -c -o Kss_Emu.lo `test -f '$(gmeversion)/gme/Kss_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Kss_Emu.Tpo $(DEPDIR)/Kss_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Kss_Emu.cpp' object='Kss_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Emu.lo `test -f '$(gmeversion)/gme/Kss_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Emu.lo `test -f '$(gmeversion)/gme/Kss_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Emu.cpp
Kss_Scc_Apu.lo: $(gmeversion)/gme/Kss_Scc_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Scc_Apu.lo -MD -MP -MF $(DEPDIR)/Kss_Scc_Apu.Tpo -c -o Kss_Scc_Apu.lo `test -f '$(gmeversion)/gme/Kss_Scc_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Scc_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Kss_Scc_Apu.Tpo $(DEPDIR)/Kss_Scc_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Kss_Scc_Apu.cpp' object='Kss_Scc_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Scc_Apu.lo -MD -MP -MF $(DEPDIR)/Kss_Scc_Apu.Tpo -c -o Kss_Scc_Apu.lo `test -f '$(gmeversion)/gme/Kss_Scc_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Scc_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Kss_Scc_Apu.Tpo $(DEPDIR)/Kss_Scc_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Kss_Scc_Apu.cpp' object='Kss_Scc_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Scc_Apu.lo `test -f '$(gmeversion)/gme/Kss_Scc_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Scc_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Scc_Apu.lo `test -f '$(gmeversion)/gme/Kss_Scc_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Scc_Apu.cpp
M3u_Playlist.lo: $(gmeversion)/gme/M3u_Playlist.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT M3u_Playlist.lo -MD -MP -MF $(DEPDIR)/M3u_Playlist.Tpo -c -o M3u_Playlist.lo `test -f '$(gmeversion)/gme/M3u_Playlist.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/M3u_Playlist.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/M3u_Playlist.Tpo $(DEPDIR)/M3u_Playlist.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/M3u_Playlist.cpp' object='M3u_Playlist.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT M3u_Playlist.lo -MD -MP -MF $(DEPDIR)/M3u_Playlist.Tpo -c -o M3u_Playlist.lo `test -f '$(gmeversion)/gme/M3u_Playlist.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/M3u_Playlist.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/M3u_Playlist.Tpo $(DEPDIR)/M3u_Playlist.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/M3u_Playlist.cpp' object='M3u_Playlist.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o M3u_Playlist.lo `test -f '$(gmeversion)/gme/M3u_Playlist.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/M3u_Playlist.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o M3u_Playlist.lo `test -f '$(gmeversion)/gme/M3u_Playlist.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/M3u_Playlist.cpp
Multi_Buffer.lo: $(gmeversion)/gme/Multi_Buffer.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Multi_Buffer.lo -MD -MP -MF $(DEPDIR)/Multi_Buffer.Tpo -c -o Multi_Buffer.lo `test -f '$(gmeversion)/gme/Multi_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Multi_Buffer.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Multi_Buffer.Tpo $(DEPDIR)/Multi_Buffer.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Multi_Buffer.cpp' object='Multi_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Multi_Buffer.lo -MD -MP -MF $(DEPDIR)/Multi_Buffer.Tpo -c -o Multi_Buffer.lo `test -f '$(gmeversion)/gme/Multi_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Multi_Buffer.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Multi_Buffer.Tpo $(DEPDIR)/Multi_Buffer.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Multi_Buffer.cpp' object='Multi_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Multi_Buffer.lo `test -f '$(gmeversion)/gme/Multi_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Multi_Buffer.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Multi_Buffer.lo `test -f '$(gmeversion)/gme/Multi_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Multi_Buffer.cpp
Music_Emu.lo: $(gmeversion)/gme/Music_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Music_Emu.lo -MD -MP -MF $(DEPDIR)/Music_Emu.Tpo -c -o Music_Emu.lo `test -f '$(gmeversion)/gme/Music_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Music_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Music_Emu.Tpo $(DEPDIR)/Music_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Music_Emu.cpp' object='Music_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Music_Emu.lo -MD -MP -MF $(DEPDIR)/Music_Emu.Tpo -c -o Music_Emu.lo `test -f '$(gmeversion)/gme/Music_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Music_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Music_Emu.Tpo $(DEPDIR)/Music_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Music_Emu.cpp' object='Music_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Music_Emu.lo `test -f '$(gmeversion)/gme/Music_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Music_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Music_Emu.lo `test -f '$(gmeversion)/gme/Music_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Music_Emu.cpp
Nes_Apu.lo: $(gmeversion)/gme/Nes_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Apu.Tpo -c -o Nes_Apu.lo `test -f '$(gmeversion)/gme/Nes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Nes_Apu.Tpo $(DEPDIR)/Nes_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Nes_Apu.cpp' object='Nes_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Apu.Tpo -c -o Nes_Apu.lo `test -f '$(gmeversion)/gme/Nes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Apu.Tpo $(DEPDIR)/Nes_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Nes_Apu.cpp' object='Nes_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Apu.lo `test -f '$(gmeversion)/gme/Nes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Apu.lo `test -f '$(gmeversion)/gme/Nes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Apu.cpp
Nes_Cpu.lo: $(gmeversion)/gme/Nes_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Cpu.lo -MD -MP -MF $(DEPDIR)/Nes_Cpu.Tpo -c -o Nes_Cpu.lo `test -f '$(gmeversion)/gme/Nes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Nes_Cpu.Tpo $(DEPDIR)/Nes_Cpu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Nes_Cpu.cpp' object='Nes_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Cpu.lo -MD -MP -MF $(DEPDIR)/Nes_Cpu.Tpo -c -o Nes_Cpu.lo `test -f '$(gmeversion)/gme/Nes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Cpu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Cpu.Tpo $(DEPDIR)/Nes_Cpu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Nes_Cpu.cpp' object='Nes_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Cpu.lo `test -f '$(gmeversion)/gme/Nes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Cpu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Cpu.lo `test -f '$(gmeversion)/gme/Nes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Cpu.cpp
Nes_Fds_Apu.lo: $(gmeversion)/gme/Nes_Fds_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Fds_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Fds_Apu.Tpo -c -o Nes_Fds_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fds_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fds_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Nes_Fds_Apu.Tpo $(DEPDIR)/Nes_Fds_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Nes_Fds_Apu.cpp' object='Nes_Fds_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Fds_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Fds_Apu.Tpo -c -o Nes_Fds_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fds_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fds_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Fds_Apu.Tpo $(DEPDIR)/Nes_Fds_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Nes_Fds_Apu.cpp' object='Nes_Fds_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Fds_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fds_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fds_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Fds_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fds_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fds_Apu.cpp
Nes_Fme7_Apu.lo: $(gmeversion)/gme/Nes_Fme7_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Fme7_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Fme7_Apu.Tpo -c -o Nes_Fme7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fme7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fme7_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Nes_Fme7_Apu.Tpo $(DEPDIR)/Nes_Fme7_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Nes_Fme7_Apu.cpp' object='Nes_Fme7_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Fme7_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Fme7_Apu.Tpo -c -o Nes_Fme7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fme7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fme7_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Fme7_Apu.Tpo $(DEPDIR)/Nes_Fme7_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Nes_Fme7_Apu.cpp' object='Nes_Fme7_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Fme7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fme7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fme7_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Fme7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fme7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fme7_Apu.cpp
Nes_Namco_Apu.lo: $(gmeversion)/gme/Nes_Namco_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Namco_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Namco_Apu.Tpo -c -o Nes_Namco_Apu.lo `test -f '$(gmeversion)/gme/Nes_Namco_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Namco_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Nes_Namco_Apu.Tpo $(DEPDIR)/Nes_Namco_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Nes_Namco_Apu.cpp' object='Nes_Namco_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Namco_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Namco_Apu.Tpo -c -o Nes_Namco_Apu.lo `test -f '$(gmeversion)/gme/Nes_Namco_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Namco_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Namco_Apu.Tpo $(DEPDIR)/Nes_Namco_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Nes_Namco_Apu.cpp' object='Nes_Namco_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Namco_Apu.lo `test -f '$(gmeversion)/gme/Nes_Namco_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Namco_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Namco_Apu.lo `test -f '$(gmeversion)/gme/Nes_Namco_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Namco_Apu.cpp
Nes_Oscs.lo: $(gmeversion)/gme/Nes_Oscs.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Oscs.lo -MD -MP -MF $(DEPDIR)/Nes_Oscs.Tpo -c -o Nes_Oscs.lo `test -f '$(gmeversion)/gme/Nes_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Oscs.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Nes_Oscs.Tpo $(DEPDIR)/Nes_Oscs.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Nes_Oscs.cpp' object='Nes_Oscs.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Oscs.lo -MD -MP -MF $(DEPDIR)/Nes_Oscs.Tpo -c -o Nes_Oscs.lo `test -f '$(gmeversion)/gme/Nes_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Oscs.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Oscs.Tpo $(DEPDIR)/Nes_Oscs.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Nes_Oscs.cpp' object='Nes_Oscs.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Oscs.lo `test -f '$(gmeversion)/gme/Nes_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Oscs.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Oscs.lo `test -f '$(gmeversion)/gme/Nes_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Oscs.cpp
Nes_Vrc6_Apu.lo: $(gmeversion)/gme/Nes_Vrc6_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Vrc6_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Vrc6_Apu.Tpo -c -o Nes_Vrc6_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc6_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Nes_Vrc6_Apu.Tpo $(DEPDIR)/Nes_Vrc6_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' object='Nes_Vrc6_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Vrc6_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Vrc6_Apu.Tpo -c -o Nes_Vrc6_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc6_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Vrc6_Apu.Tpo $(DEPDIR)/Nes_Vrc6_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' object='Nes_Vrc6_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Vrc6_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc6_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Vrc6_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc6_Apu.cpp
Nes_Vrc7_Apu.lo: $(gmeversion)/gme/Nes_Vrc7_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Vrc7_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Vrc7_Apu.Tpo -c -o Nes_Vrc7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc7_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Nes_Vrc7_Apu.Tpo $(DEPDIR)/Nes_Vrc7_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' object='Nes_Vrc7_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Vrc7_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Vrc7_Apu.Tpo -c -o Nes_Vrc7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc7_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Vrc7_Apu.Tpo $(DEPDIR)/Nes_Vrc7_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' object='Nes_Vrc7_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Vrc7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc7_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Vrc7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc7_Apu.cpp
Nsf_Core.lo: $(gmeversion)/gme/Nsf_Core.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Core.lo -MD -MP -MF $(DEPDIR)/Nsf_Core.Tpo -c -o Nsf_Core.lo `test -f '$(gmeversion)/gme/Nsf_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Core.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Nsf_Core.Tpo $(DEPDIR)/Nsf_Core.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Nsf_Core.cpp' object='Nsf_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Core.lo -MD -MP -MF $(DEPDIR)/Nsf_Core.Tpo -c -o Nsf_Core.lo `test -f '$(gmeversion)/gme/Nsf_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Core.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Nsf_Core.Tpo $(DEPDIR)/Nsf_Core.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Nsf_Core.cpp' object='Nsf_Core.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Core.lo `test -f '$(gmeversion)/gme/Nsf_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Core.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Core.lo `test -f '$(gmeversion)/gme/Nsf_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Core.cpp
Nsf_Cpu.lo: $(gmeversion)/gme/Nsf_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Cpu.lo -MD -MP -MF $(DEPDIR)/Nsf_Cpu.Tpo -c -o Nsf_Cpu.lo `test -f '$(gmeversion)/gme/Nsf_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Nsf_Cpu.Tpo $(DEPDIR)/Nsf_Cpu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Nsf_Cpu.cpp' object='Nsf_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Cpu.lo -MD -MP -MF $(DEPDIR)/Nsf_Cpu.Tpo -c -o Nsf_Cpu.lo `test -f '$(gmeversion)/gme/Nsf_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Cpu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Nsf_Cpu.Tpo $(DEPDIR)/Nsf_Cpu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Nsf_Cpu.cpp' object='Nsf_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Cpu.lo `test -f '$(gmeversion)/gme/Nsf_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Cpu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Cpu.lo `test -f '$(gmeversion)/gme/Nsf_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Cpu.cpp
Nsfe_Emu.lo: $(gmeversion)/gme/Nsfe_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsfe_Emu.lo -MD -MP -MF $(DEPDIR)/Nsfe_Emu.Tpo -c -o Nsfe_Emu.lo `test -f '$(gmeversion)/gme/Nsfe_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsfe_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Nsfe_Emu.Tpo $(DEPDIR)/Nsfe_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Nsfe_Emu.cpp' object='Nsfe_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsfe_Emu.lo -MD -MP -MF $(DEPDIR)/Nsfe_Emu.Tpo -c -o Nsfe_Emu.lo `test -f '$(gmeversion)/gme/Nsfe_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsfe_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Nsfe_Emu.Tpo $(DEPDIR)/Nsfe_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Nsfe_Emu.cpp' object='Nsfe_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsfe_Emu.lo `test -f '$(gmeversion)/gme/Nsfe_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsfe_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsfe_Emu.lo `test -f '$(gmeversion)/gme/Nsfe_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsfe_Emu.cpp
Nsf_Emu.lo: $(gmeversion)/gme/Nsf_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Emu.lo -MD -MP -MF $(DEPDIR)/Nsf_Emu.Tpo -c -o Nsf_Emu.lo `test -f '$(gmeversion)/gme/Nsf_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Nsf_Emu.Tpo $(DEPDIR)/Nsf_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Nsf_Emu.cpp' object='Nsf_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Emu.lo -MD -MP -MF $(DEPDIR)/Nsf_Emu.Tpo -c -o Nsf_Emu.lo `test -f '$(gmeversion)/gme/Nsf_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Nsf_Emu.Tpo $(DEPDIR)/Nsf_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Nsf_Emu.cpp' object='Nsf_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Emu.lo `test -f '$(gmeversion)/gme/Nsf_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Emu.lo `test -f '$(gmeversion)/gme/Nsf_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Emu.cpp
Nsf_Impl.lo: $(gmeversion)/gme/Nsf_Impl.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Impl.lo -MD -MP -MF $(DEPDIR)/Nsf_Impl.Tpo -c -o Nsf_Impl.lo `test -f '$(gmeversion)/gme/Nsf_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Impl.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Nsf_Impl.Tpo $(DEPDIR)/Nsf_Impl.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Nsf_Impl.cpp' object='Nsf_Impl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Impl.lo -MD -MP -MF $(DEPDIR)/Nsf_Impl.Tpo -c -o Nsf_Impl.lo `test -f '$(gmeversion)/gme/Nsf_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Impl.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Nsf_Impl.Tpo $(DEPDIR)/Nsf_Impl.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Nsf_Impl.cpp' object='Nsf_Impl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Impl.lo `test -f '$(gmeversion)/gme/Nsf_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Impl.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Impl.lo `test -f '$(gmeversion)/gme/Nsf_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Impl.cpp
Opl_Apu.lo: $(gmeversion)/gme/Opl_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Opl_Apu.lo -MD -MP -MF $(DEPDIR)/Opl_Apu.Tpo -c -o Opl_Apu.lo `test -f '$(gmeversion)/gme/Opl_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Opl_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Opl_Apu.Tpo $(DEPDIR)/Opl_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Opl_Apu.cpp' object='Opl_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Opl_Apu.lo -MD -MP -MF $(DEPDIR)/Opl_Apu.Tpo -c -o Opl_Apu.lo `test -f '$(gmeversion)/gme/Opl_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Opl_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Opl_Apu.Tpo $(DEPDIR)/Opl_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Opl_Apu.cpp' object='Opl_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Opl_Apu.lo `test -f '$(gmeversion)/gme/Opl_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Opl_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Opl_Apu.lo `test -f '$(gmeversion)/gme/Opl_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Opl_Apu.cpp
Resampler.lo: $(gmeversion)/gme/Resampler.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Resampler.lo -MD -MP -MF $(DEPDIR)/Resampler.Tpo -c -o Resampler.lo `test -f '$(gmeversion)/gme/Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Resampler.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Resampler.Tpo $(DEPDIR)/Resampler.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Resampler.cpp' object='Resampler.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Resampler.lo -MD -MP -MF $(DEPDIR)/Resampler.Tpo -c -o Resampler.lo `test -f '$(gmeversion)/gme/Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Resampler.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Resampler.Tpo $(DEPDIR)/Resampler.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Resampler.cpp' object='Resampler.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Resampler.lo `test -f '$(gmeversion)/gme/Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Resampler.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Resampler.lo `test -f '$(gmeversion)/gme/Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Resampler.cpp
Rom_Data.lo: $(gmeversion)/gme/Rom_Data.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Rom_Data.lo -MD -MP -MF $(DEPDIR)/Rom_Data.Tpo -c -o Rom_Data.lo `test -f '$(gmeversion)/gme/Rom_Data.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Rom_Data.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Rom_Data.Tpo $(DEPDIR)/Rom_Data.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Rom_Data.cpp' object='Rom_Data.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Rom_Data.lo -MD -MP -MF $(DEPDIR)/Rom_Data.Tpo -c -o Rom_Data.lo `test -f '$(gmeversion)/gme/Rom_Data.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Rom_Data.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Rom_Data.Tpo $(DEPDIR)/Rom_Data.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Rom_Data.cpp' object='Rom_Data.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Rom_Data.lo `test -f '$(gmeversion)/gme/Rom_Data.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Rom_Data.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Rom_Data.lo `test -f '$(gmeversion)/gme/Rom_Data.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Rom_Data.cpp
Sap_Apu.lo: $(gmeversion)/gme/Sap_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Apu.lo -MD -MP -MF $(DEPDIR)/Sap_Apu.Tpo -c -o Sap_Apu.lo `test -f '$(gmeversion)/gme/Sap_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Sap_Apu.Tpo $(DEPDIR)/Sap_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Sap_Apu.cpp' object='Sap_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Apu.lo -MD -MP -MF $(DEPDIR)/Sap_Apu.Tpo -c -o Sap_Apu.lo `test -f '$(gmeversion)/gme/Sap_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Sap_Apu.Tpo $(DEPDIR)/Sap_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Sap_Apu.cpp' object='Sap_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Apu.lo `test -f '$(gmeversion)/gme/Sap_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Apu.lo `test -f '$(gmeversion)/gme/Sap_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Apu.cpp
Sap_Core.lo: $(gmeversion)/gme/Sap_Core.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Core.lo -MD -MP -MF $(DEPDIR)/Sap_Core.Tpo -c -o Sap_Core.lo `test -f '$(gmeversion)/gme/Sap_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Core.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Sap_Core.Tpo $(DEPDIR)/Sap_Core.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Sap_Core.cpp' object='Sap_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Core.lo -MD -MP -MF $(DEPDIR)/Sap_Core.Tpo -c -o Sap_Core.lo `test -f '$(gmeversion)/gme/Sap_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Core.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Sap_Core.Tpo $(DEPDIR)/Sap_Core.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Sap_Core.cpp' object='Sap_Core.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Core.lo `test -f '$(gmeversion)/gme/Sap_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Core.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Core.lo `test -f '$(gmeversion)/gme/Sap_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Core.cpp
Sap_Cpu.lo: $(gmeversion)/gme/Sap_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Cpu.lo -MD -MP -MF $(DEPDIR)/Sap_Cpu.Tpo -c -o Sap_Cpu.lo `test -f '$(gmeversion)/gme/Sap_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Sap_Cpu.Tpo $(DEPDIR)/Sap_Cpu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Sap_Cpu.cpp' object='Sap_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Cpu.lo -MD -MP -MF $(DEPDIR)/Sap_Cpu.Tpo -c -o Sap_Cpu.lo `test -f '$(gmeversion)/gme/Sap_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Cpu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Sap_Cpu.Tpo $(DEPDIR)/Sap_Cpu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Sap_Cpu.cpp' object='Sap_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Cpu.lo `test -f '$(gmeversion)/gme/Sap_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Cpu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Cpu.lo `test -f '$(gmeversion)/gme/Sap_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Cpu.cpp
Sap_Emu.lo: $(gmeversion)/gme/Sap_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Emu.lo -MD -MP -MF $(DEPDIR)/Sap_Emu.Tpo -c -o Sap_Emu.lo `test -f '$(gmeversion)/gme/Sap_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Sap_Emu.Tpo $(DEPDIR)/Sap_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Sap_Emu.cpp' object='Sap_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Emu.lo -MD -MP -MF $(DEPDIR)/Sap_Emu.Tpo -c -o Sap_Emu.lo `test -f '$(gmeversion)/gme/Sap_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Sap_Emu.Tpo $(DEPDIR)/Sap_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Sap_Emu.cpp' object='Sap_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Emu.lo `test -f '$(gmeversion)/gme/Sap_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Emu.lo `test -f '$(gmeversion)/gme/Sap_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Emu.cpp
Sgc_Core.lo: $(gmeversion)/gme/Sgc_Core.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Core.lo -MD -MP -MF $(DEPDIR)/Sgc_Core.Tpo -c -o Sgc_Core.lo `test -f '$(gmeversion)/gme/Sgc_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Core.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Sgc_Core.Tpo $(DEPDIR)/Sgc_Core.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Sgc_Core.cpp' object='Sgc_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Core.lo -MD -MP -MF $(DEPDIR)/Sgc_Core.Tpo -c -o Sgc_Core.lo `test -f '$(gmeversion)/gme/Sgc_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Core.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Sgc_Core.Tpo $(DEPDIR)/Sgc_Core.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Sgc_Core.cpp' object='Sgc_Core.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Core.lo `test -f '$(gmeversion)/gme/Sgc_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Core.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Core.lo `test -f '$(gmeversion)/gme/Sgc_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Core.cpp
Sgc_Cpu.lo: $(gmeversion)/gme/Sgc_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Cpu.lo -MD -MP -MF $(DEPDIR)/Sgc_Cpu.Tpo -c -o Sgc_Cpu.lo `test -f '$(gmeversion)/gme/Sgc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Sgc_Cpu.Tpo $(DEPDIR)/Sgc_Cpu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Sgc_Cpu.cpp' object='Sgc_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Cpu.lo -MD -MP -MF $(DEPDIR)/Sgc_Cpu.Tpo -c -o Sgc_Cpu.lo `test -f '$(gmeversion)/gme/Sgc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Cpu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Sgc_Cpu.Tpo $(DEPDIR)/Sgc_Cpu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Sgc_Cpu.cpp' object='Sgc_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Cpu.lo `test -f '$(gmeversion)/gme/Sgc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Cpu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Cpu.lo `test -f '$(gmeversion)/gme/Sgc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Cpu.cpp
Sgc_Emu.lo: $(gmeversion)/gme/Sgc_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Emu.lo -MD -MP -MF $(DEPDIR)/Sgc_Emu.Tpo -c -o Sgc_Emu.lo `test -f '$(gmeversion)/gme/Sgc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Sgc_Emu.Tpo $(DEPDIR)/Sgc_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Sgc_Emu.cpp' object='Sgc_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Emu.lo -MD -MP -MF $(DEPDIR)/Sgc_Emu.Tpo -c -o Sgc_Emu.lo `test -f '$(gmeversion)/gme/Sgc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Sgc_Emu.Tpo $(DEPDIR)/Sgc_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Sgc_Emu.cpp' object='Sgc_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Emu.lo `test -f '$(gmeversion)/gme/Sgc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Emu.lo `test -f '$(gmeversion)/gme/Sgc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Emu.cpp
Sgc_Impl.lo: $(gmeversion)/gme/Sgc_Impl.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Impl.lo -MD -MP -MF $(DEPDIR)/Sgc_Impl.Tpo -c -o Sgc_Impl.lo `test -f '$(gmeversion)/gme/Sgc_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Impl.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Sgc_Impl.Tpo $(DEPDIR)/Sgc_Impl.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Sgc_Impl.cpp' object='Sgc_Impl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sgc_Impl.lo -MD -MP -MF $(DEPDIR)/Sgc_Impl.Tpo -c -o Sgc_Impl.lo `test -f '$(gmeversion)/gme/Sgc_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Impl.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Sgc_Impl.Tpo $(DEPDIR)/Sgc_Impl.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Sgc_Impl.cpp' object='Sgc_Impl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Impl.lo `test -f '$(gmeversion)/gme/Sgc_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Impl.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Impl.lo `test -f '$(gmeversion)/gme/Sgc_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Impl.cpp
Sms_Apu.lo: $(gmeversion)/gme/Sms_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sms_Apu.lo -MD -MP -MF $(DEPDIR)/Sms_Apu.Tpo -c -o Sms_Apu.lo `test -f '$(gmeversion)/gme/Sms_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Sms_Apu.Tpo $(DEPDIR)/Sms_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Sms_Apu.cpp' object='Sms_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sms_Apu.lo -MD -MP -MF $(DEPDIR)/Sms_Apu.Tpo -c -o Sms_Apu.lo `test -f '$(gmeversion)/gme/Sms_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Sms_Apu.Tpo $(DEPDIR)/Sms_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Sms_Apu.cpp' object='Sms_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sms_Apu.lo `test -f '$(gmeversion)/gme/Sms_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sms_Apu.lo `test -f '$(gmeversion)/gme/Sms_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Apu.cpp
Sms_Fm_Apu.lo: $(gmeversion)/gme/Sms_Fm_Apu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sms_Fm_Apu.lo -MD -MP -MF $(DEPDIR)/Sms_Fm_Apu.Tpo -c -o Sms_Fm_Apu.lo `test -f '$(gmeversion)/gme/Sms_Fm_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Fm_Apu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Sms_Fm_Apu.Tpo $(DEPDIR)/Sms_Fm_Apu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Sms_Fm_Apu.cpp' object='Sms_Fm_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sms_Fm_Apu.lo -MD -MP -MF $(DEPDIR)/Sms_Fm_Apu.Tpo -c -o Sms_Fm_Apu.lo `test -f '$(gmeversion)/gme/Sms_Fm_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Fm_Apu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Sms_Fm_Apu.Tpo $(DEPDIR)/Sms_Fm_Apu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Sms_Fm_Apu.cpp' object='Sms_Fm_Apu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sms_Fm_Apu.lo `test -f '$(gmeversion)/gme/Sms_Fm_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Fm_Apu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sms_Fm_Apu.lo `test -f '$(gmeversion)/gme/Sms_Fm_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Fm_Apu.cpp
Snes_Spc.lo: $(gmeversion)/gme/Snes_Spc.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Snes_Spc.lo -MD -MP -MF $(DEPDIR)/Snes_Spc.Tpo -c -o Snes_Spc.lo `test -f '$(gmeversion)/gme/Snes_Spc.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Snes_Spc.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Snes_Spc.Tpo $(DEPDIR)/Snes_Spc.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Snes_Spc.cpp' object='Snes_Spc.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Snes_Spc.lo -MD -MP -MF $(DEPDIR)/Snes_Spc.Tpo -c -o Snes_Spc.lo `test -f '$(gmeversion)/gme/Snes_Spc.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Snes_Spc.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Snes_Spc.Tpo $(DEPDIR)/Snes_Spc.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Snes_Spc.cpp' object='Snes_Spc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Snes_Spc.lo `test -f '$(gmeversion)/gme/Snes_Spc.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Snes_Spc.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Snes_Spc.lo `test -f '$(gmeversion)/gme/Snes_Spc.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Snes_Spc.cpp
Spc_Cpu.lo: $(gmeversion)/gme/Spc_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Cpu.lo -MD -MP -MF $(DEPDIR)/Spc_Cpu.Tpo -c -o Spc_Cpu.lo `test -f '$(gmeversion)/gme/Spc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Spc_Cpu.Tpo $(DEPDIR)/Spc_Cpu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Spc_Cpu.cpp' object='Spc_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Cpu.lo -MD -MP -MF $(DEPDIR)/Spc_Cpu.Tpo -c -o Spc_Cpu.lo `test -f '$(gmeversion)/gme/Spc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Cpu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Spc_Cpu.Tpo $(DEPDIR)/Spc_Cpu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Spc_Cpu.cpp' object='Spc_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Cpu.lo `test -f '$(gmeversion)/gme/Spc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Cpu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Cpu.lo `test -f '$(gmeversion)/gme/Spc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Cpu.cpp
Spc_Dsp.lo: $(gmeversion)/gme/Spc_Dsp.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Dsp.lo -MD -MP -MF $(DEPDIR)/Spc_Dsp.Tpo -c -o Spc_Dsp.lo `test -f '$(gmeversion)/gme/Spc_Dsp.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Dsp.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Spc_Dsp.Tpo $(DEPDIR)/Spc_Dsp.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Spc_Dsp.cpp' object='Spc_Dsp.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Dsp.lo -MD -MP -MF $(DEPDIR)/Spc_Dsp.Tpo -c -o Spc_Dsp.lo `test -f '$(gmeversion)/gme/Spc_Dsp.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Dsp.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Spc_Dsp.Tpo $(DEPDIR)/Spc_Dsp.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Spc_Dsp.cpp' object='Spc_Dsp.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Dsp.lo `test -f '$(gmeversion)/gme/Spc_Dsp.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Dsp.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Dsp.lo `test -f '$(gmeversion)/gme/Spc_Dsp.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Dsp.cpp
Spc_Emu.lo: $(gmeversion)/gme/Spc_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Emu.lo -MD -MP -MF $(DEPDIR)/Spc_Emu.Tpo -c -o Spc_Emu.lo `test -f '$(gmeversion)/gme/Spc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Spc_Emu.Tpo $(DEPDIR)/Spc_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Spc_Emu.cpp' object='Spc_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Emu.lo -MD -MP -MF $(DEPDIR)/Spc_Emu.Tpo -c -o Spc_Emu.lo `test -f '$(gmeversion)/gme/Spc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Spc_Emu.Tpo $(DEPDIR)/Spc_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Spc_Emu.cpp' object='Spc_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Emu.lo `test -f '$(gmeversion)/gme/Spc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Emu.lo `test -f '$(gmeversion)/gme/Spc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Emu.cpp
SPC_Filter.lo: $(gmeversion)/gme/SPC_Filter.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SPC_Filter.lo -MD -MP -MF $(DEPDIR)/SPC_Filter.Tpo -c -o SPC_Filter.lo `test -f '$(gmeversion)/gme/SPC_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/SPC_Filter.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/SPC_Filter.Tpo $(DEPDIR)/SPC_Filter.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/SPC_Filter.cpp' object='SPC_Filter.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SPC_Filter.lo -MD -MP -MF $(DEPDIR)/SPC_Filter.Tpo -c -o SPC_Filter.lo `test -f '$(gmeversion)/gme/SPC_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/SPC_Filter.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/SPC_Filter.Tpo $(DEPDIR)/SPC_Filter.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/SPC_Filter.cpp' object='SPC_Filter.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SPC_Filter.lo `test -f '$(gmeversion)/gme/SPC_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/SPC_Filter.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SPC_Filter.lo `test -f '$(gmeversion)/gme/SPC_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/SPC_Filter.cpp
Track_Filter.lo: $(gmeversion)/gme/Track_Filter.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Track_Filter.lo -MD -MP -MF $(DEPDIR)/Track_Filter.Tpo -c -o Track_Filter.lo `test -f '$(gmeversion)/gme/Track_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Track_Filter.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Track_Filter.Tpo $(DEPDIR)/Track_Filter.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Track_Filter.cpp' object='Track_Filter.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Track_Filter.lo -MD -MP -MF $(DEPDIR)/Track_Filter.Tpo -c -o Track_Filter.lo `test -f '$(gmeversion)/gme/Track_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Track_Filter.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Track_Filter.Tpo $(DEPDIR)/Track_Filter.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Track_Filter.cpp' object='Track_Filter.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Track_Filter.lo `test -f '$(gmeversion)/gme/Track_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Track_Filter.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Track_Filter.lo `test -f '$(gmeversion)/gme/Track_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Track_Filter.cpp
Upsampler.lo: $(gmeversion)/gme/Upsampler.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Upsampler.lo -MD -MP -MF $(DEPDIR)/Upsampler.Tpo -c -o Upsampler.lo `test -f '$(gmeversion)/gme/Upsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Upsampler.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Upsampler.Tpo $(DEPDIR)/Upsampler.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Upsampler.cpp' object='Upsampler.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Upsampler.lo -MD -MP -MF $(DEPDIR)/Upsampler.Tpo -c -o Upsampler.lo `test -f '$(gmeversion)/gme/Upsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Upsampler.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Upsampler.Tpo $(DEPDIR)/Upsampler.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Upsampler.cpp' object='Upsampler.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Upsampler.lo `test -f '$(gmeversion)/gme/Upsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Upsampler.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Upsampler.lo `test -f '$(gmeversion)/gme/Upsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Upsampler.cpp
Vgm_Core.lo: $(gmeversion)/gme/Vgm_Core.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Vgm_Core.lo -MD -MP -MF $(DEPDIR)/Vgm_Core.Tpo -c -o Vgm_Core.lo `test -f '$(gmeversion)/gme/Vgm_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Core.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Vgm_Core.Tpo $(DEPDIR)/Vgm_Core.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Vgm_Core.cpp' object='Vgm_Core.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Vgm_Core.lo -MD -MP -MF $(DEPDIR)/Vgm_Core.Tpo -c -o Vgm_Core.lo `test -f '$(gmeversion)/gme/Vgm_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Core.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Vgm_Core.Tpo $(DEPDIR)/Vgm_Core.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Vgm_Core.cpp' object='Vgm_Core.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Vgm_Core.lo `test -f '$(gmeversion)/gme/Vgm_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Core.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Vgm_Core.lo `test -f '$(gmeversion)/gme/Vgm_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Core.cpp
Vgm_Emu.lo: $(gmeversion)/gme/Vgm_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Vgm_Emu.lo -MD -MP -MF $(DEPDIR)/Vgm_Emu.Tpo -c -o Vgm_Emu.lo `test -f '$(gmeversion)/gme/Vgm_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Vgm_Emu.Tpo $(DEPDIR)/Vgm_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Vgm_Emu.cpp' object='Vgm_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Vgm_Emu.lo -MD -MP -MF $(DEPDIR)/Vgm_Emu.Tpo -c -o Vgm_Emu.lo `test -f '$(gmeversion)/gme/Vgm_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Vgm_Emu.Tpo $(DEPDIR)/Vgm_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Vgm_Emu.cpp' object='Vgm_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Vgm_Emu.lo `test -f '$(gmeversion)/gme/Vgm_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Vgm_Emu.lo `test -f '$(gmeversion)/gme/Vgm_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Emu.cpp
Ym2413_Emu.lo: $(gmeversion)/gme/Ym2413_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ym2413_Emu.lo -MD -MP -MF $(DEPDIR)/Ym2413_Emu.Tpo -c -o Ym2413_Emu.lo `test -f '$(gmeversion)/gme/Ym2413_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2413_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Ym2413_Emu.Tpo $(DEPDIR)/Ym2413_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Ym2413_Emu.cpp' object='Ym2413_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ym2413_Emu.lo -MD -MP -MF $(DEPDIR)/Ym2413_Emu.Tpo -c -o Ym2413_Emu.lo `test -f '$(gmeversion)/gme/Ym2413_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2413_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Ym2413_Emu.Tpo $(DEPDIR)/Ym2413_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Ym2413_Emu.cpp' object='Ym2413_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ym2413_Emu.lo `test -f '$(gmeversion)/gme/Ym2413_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2413_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ym2413_Emu.lo `test -f '$(gmeversion)/gme/Ym2413_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2413_Emu.cpp
Ym2612_Emu.lo: $(gmeversion)/gme/Ym2612_Emu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ym2612_Emu.lo -MD -MP -MF $(DEPDIR)/Ym2612_Emu.Tpo -c -o Ym2612_Emu.lo `test -f '$(gmeversion)/gme/Ym2612_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2612_Emu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Ym2612_Emu.Tpo $(DEPDIR)/Ym2612_Emu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Ym2612_Emu.cpp' object='Ym2612_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ym2612_Emu.lo -MD -MP -MF $(DEPDIR)/Ym2612_Emu.Tpo -c -o Ym2612_Emu.lo `test -f '$(gmeversion)/gme/Ym2612_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2612_Emu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Ym2612_Emu.Tpo $(DEPDIR)/Ym2612_Emu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Ym2612_Emu.cpp' object='Ym2612_Emu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ym2612_Emu.lo `test -f '$(gmeversion)/gme/Ym2612_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2612_Emu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ym2612_Emu.lo `test -f '$(gmeversion)/gme/Ym2612_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2612_Emu.cpp
ymdeltat.lo: $(gmeversion)/gme/ymdeltat.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ymdeltat.lo -MD -MP -MF $(DEPDIR)/ymdeltat.Tpo -c -o ymdeltat.lo `test -f '$(gmeversion)/gme/ymdeltat.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/ymdeltat.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/ymdeltat.Tpo $(DEPDIR)/ymdeltat.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/ymdeltat.cpp' object='ymdeltat.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ymdeltat.lo -MD -MP -MF $(DEPDIR)/ymdeltat.Tpo -c -o ymdeltat.lo `test -f '$(gmeversion)/gme/ymdeltat.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/ymdeltat.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ymdeltat.Tpo $(DEPDIR)/ymdeltat.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/ymdeltat.cpp' object='ymdeltat.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ymdeltat.lo `test -f '$(gmeversion)/gme/ymdeltat.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/ymdeltat.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ymdeltat.lo `test -f '$(gmeversion)/gme/ymdeltat.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/ymdeltat.cpp
Z80_Cpu.lo: $(gmeversion)/gme/Z80_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Z80_Cpu.lo -MD -MP -MF $(DEPDIR)/Z80_Cpu.Tpo -c -o Z80_Cpu.lo `test -f '$(gmeversion)/gme/Z80_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Z80_Cpu.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Z80_Cpu.Tpo $(DEPDIR)/Z80_Cpu.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Z80_Cpu.cpp' object='Z80_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Z80_Cpu.lo -MD -MP -MF $(DEPDIR)/Z80_Cpu.Tpo -c -o Z80_Cpu.lo `test -f '$(gmeversion)/gme/Z80_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Z80_Cpu.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Z80_Cpu.Tpo $(DEPDIR)/Z80_Cpu.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Z80_Cpu.cpp' object='Z80_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Z80_Cpu.lo `test -f '$(gmeversion)/gme/Z80_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Z80_Cpu.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Z80_Cpu.lo `test -f '$(gmeversion)/gme/Z80_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Z80_Cpu.cpp
Data_Reader.lo: $(gmeversion)/gme/Data_Reader.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Data_Reader.lo -MD -MP -MF $(DEPDIR)/Data_Reader.Tpo -c -o Data_Reader.lo `test -f '$(gmeversion)/gme/Data_Reader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Data_Reader.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Data_Reader.Tpo $(DEPDIR)/Data_Reader.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(gmeversion)/gme/Data_Reader.cpp' object='Data_Reader.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Data_Reader.lo -MD -MP -MF $(DEPDIR)/Data_Reader.Tpo -c -o Data_Reader.lo `test -f '$(gmeversion)/gme/Data_Reader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Data_Reader.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/Data_Reader.Tpo $(DEPDIR)/Data_Reader.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(gmeversion)/gme/Data_Reader.cpp' object='Data_Reader.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Data_Reader.lo `test -f '$(gmeversion)/gme/Data_Reader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Data_Reader.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Data_Reader.lo `test -f '$(gmeversion)/gme/Data_Reader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Data_Reader.cpp
mostlyclean-libtool:
-rm -f *.lo
@@@ -1692,26 -1573,15 +1600,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -1723,15 -1593,11 +1620,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -1740,6 -1606,21 +1633,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -1884,19 -1765,20 +1792,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/gtkui/Makefile.in
index 50ada7b,5043800..a3f196e
--- a/plugins/gtkui/Makefile.in
+++ b/plugins/gtkui/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -17,23 -16,51 +20,71 @@@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -53,8 -80,8 +104,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/gtkui
- DIST_COMMON = $(sdk_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp $(sdk_HEADERS) COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -111,21 -138,8 +162,8 @@@ am__uninstall_files_from_dir = {
}
am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sdkdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
@STATICLINK_TRUE at ddb_gui_GTK2_fallback_la_DEPENDENCIES = \
- @STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgtk-x11-2.0.la \
- @STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgdk-x11-2.0.la \
- @STATICLINK_TRUE@ $(GTK_ROOT)/lib/libpangoft2-1.0.la \
- @STATICLINK_TRUE@ $(GTK_ROOT)/lib/libpangocairo-1.0.la \
- @STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la \
- @STATICLINK_TRUE@ $(GTK_ROOT)/lib/libcairo.la \
- @STATICLINK_TRUE@ $(GTK_ROOT)/lib/libpango-1.0.la \
- @STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgobject-2.0.la \
- @STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgmodule-2.0.la \
- @STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgthread-2.0.la \
- @STATICLINK_TRUE@ $(GTK_ROOT)/lib/libglib-2.0.la \
- @STATICLINK_TRUE@ ../libparser/libparser.a \
- @STATICLINK_TRUE@ $(am__DEPENDENCIES_1)
+ @STATICLINK_TRUE@ ../libparser/libparser.a
am__ddb_gui_GTK2_fallback_la_SOURCES_DIST = gtkui.c gtkui.h \
callbacks.c interface.c support.c callbacks.h interface.h \
support.h ddblistview.c ddblistview.h mainplaylist.c \
@@@ -178,8 -192,12 +216,12 @@@ am__objects_1 = ddb_gui_GTK2_fallback_l
@STATICLINK_TRUE@ $(am__objects_2)
ddb_gui_GTK2_fallback_la_OBJECTS = \
$(am_ddb_gui_GTK2_fallback_la_OBJECTS)
- ddb_gui_GTK2_fallback_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ ddb_gui_GTK2_fallback_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) \
$(ddb_gui_GTK2_fallback_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_TRUE at am_ddb_gui_GTK2_fallback_la_rpath = \
@@@ -188,13 -206,9 +230,9 @@@
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at am_ddb_gui_GTK2_fallback_la_rpath = \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@ -rpath \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@ $(pkglibdir)
- @HAVE_GTK2_TRUE@@STATICLINK_FALSE at ddb_gui_GTK2_la_DEPENDENCIES = \
- @HAVE_GTK2_TRUE@@STATICLINK_FALSE@ $(am__DEPENDENCIES_1) \
- @HAVE_GTK2_TRUE@@STATICLINK_FALSE@ ../libparser/libparser.a \
- @HAVE_GTK2_TRUE@@STATICLINK_FALSE@ $(am__DEPENDENCIES_1)
- @HAVE_GTK2_TRUE@@STATICLINK_TRUE at ddb_gui_GTK2_la_DEPENDENCIES = \
- @HAVE_GTK2_TRUE@@STATICLINK_TRUE@ ../libparser/libparser.a \
- @HAVE_GTK2_TRUE@@STATICLINK_TRUE@ $(am__DEPENDENCIES_1)
+ am__DEPENDENCIES_1 =
+ @HAVE_GTK2_TRUE at ddb_gui_GTK2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ @HAVE_GTK2_TRUE@ ../libparser/libparser.a
am__ddb_gui_GTK2_la_SOURCES_DIST = gtkui.c gtkui.h callbacks.c \
interface.c support.c callbacks.h interface.h support.h \
ddblistview.c ddblistview.h mainplaylist.c mainplaylist.h \
@@@ -230,9 -244,10 +268,10 @@@ am__objects_3 = ddb_gui_GTK2_la-gtkui.l
@HAVE_GTK2_TRUE at am__objects_4 = $(am__objects_3)
@HAVE_GTK2_TRUE at am_ddb_gui_GTK2_la_OBJECTS = $(am__objects_4)
ddb_gui_GTK2_la_OBJECTS = $(am_ddb_gui_GTK2_la_OBJECTS)
- ddb_gui_GTK2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(ddb_gui_GTK2_la_CFLAGS) \
- $(CFLAGS) $(ddb_gui_GTK2_la_LDFLAGS) $(LDFLAGS) -o $@
+ ddb_gui_GTK2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) $(ddb_gui_GTK2_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_FALSE at am_ddb_gui_GTK2_la_rpath = \
@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_FALSE@ -rpath \
@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_FALSE@ $(pkglibdir)
@@@ -245,13 -260,8 +284,8 @@@
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at am_ddb_gui_GTK2_la_rpath = \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@ -rpath \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@ $(pkglibdir)
- @HAVE_GTK3_TRUE@@STATICLINK_FALSE at ddb_gui_GTK3_la_DEPENDENCIES = \
- @HAVE_GTK3_TRUE@@STATICLINK_FALSE@ $(am__DEPENDENCIES_1) \
- @HAVE_GTK3_TRUE@@STATICLINK_FALSE@ ../libparser/libparser.a \
- @HAVE_GTK3_TRUE@@STATICLINK_FALSE@ $(am__DEPENDENCIES_1)
- @HAVE_GTK3_TRUE@@STATICLINK_TRUE at ddb_gui_GTK3_la_DEPENDENCIES = \
- @HAVE_GTK3_TRUE@@STATICLINK_TRUE@ ../libparser/libparser.a \
- @HAVE_GTK3_TRUE@@STATICLINK_TRUE@ $(am__DEPENDENCIES_1)
+ @HAVE_GTK3_TRUE at ddb_gui_GTK3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ @HAVE_GTK3_TRUE@ ../libparser/libparser.a
am__ddb_gui_GTK3_la_SOURCES_DIST = gtkui.c gtkui.h callbacks.c \
interface.c support.c callbacks.h interface.h support.h \
ddblistview.c ddblistview.h mainplaylist.c mainplaylist.h \
@@@ -265,7 -275,7 +299,7 @@@
ddbcellrenderertextmultiline.h ddbseekbar.c ddbequalizer.c \
ddbcellrenderertextmultiline.c gtkuigl.c gtkuigl.h hotkeys.c \
hotkeys.h actionhandlers.c actionhandlers.h pltmenu.c \
- ctmapping.c ctmapping.h namedicons.c namedicons.h
+ ctmapping.c ctmapping.h namedicons.c namedicons.h retina.m
am__objects_5 = ddb_gui_GTK3_la-gtkui.lo ddb_gui_GTK3_la-callbacks.lo \
ddb_gui_GTK3_la-interface.lo ddb_gui_GTK3_la-support.lo \
ddb_gui_GTK3_la-ddblistview.lo ddb_gui_GTK3_la-mainplaylist.lo \
@@@ -284,15 -294,14 +318,14 @@@
ddb_gui_GTK3_la-gtkuigl.lo ddb_gui_GTK3_la-hotkeys.lo \
ddb_gui_GTK3_la-actionhandlers.lo ddb_gui_GTK3_la-pltmenu.lo \
ddb_gui_GTK3_la-ctmapping.lo ddb_gui_GTK3_la-namedicons.lo
- @HAVE_GTK3_TRUE at am__objects_6 = $(am__objects_5)
- @HAVE_GTK3_TRUE@@STATICLINK_FALSE at am_ddb_gui_GTK3_la_OBJECTS = \
- @HAVE_GTK3_TRUE@@STATICLINK_FALSE@ $(am__objects_6)
- @HAVE_GTK3_TRUE@@STATICLINK_TRUE at am_ddb_gui_GTK3_la_OBJECTS = \
- @HAVE_GTK3_TRUE@@STATICLINK_TRUE@ $(am__objects_6)
+ @OS_OSX_TRUE at am__objects_6 = ddb_gui_GTK3_la-retina.lo
+ @HAVE_GTK3_TRUE at am__objects_7 = $(am__objects_5) $(am__objects_6)
+ @HAVE_GTK3_TRUE at am_ddb_gui_GTK3_la_OBJECTS = $(am__objects_7)
ddb_gui_GTK3_la_OBJECTS = $(am_ddb_gui_GTK3_la_OBJECTS)
- ddb_gui_GTK3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(ddb_gui_GTK3_la_CFLAGS) \
- $(CFLAGS) $(ddb_gui_GTK3_la_LDFLAGS) $(LDFLAGS) -o $@
+ ddb_gui_GTK3_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(OBJCLD) \
+ $(ddb_gui_GTK3_la_OBJCFLAGS) $(OBJCFLAGS) \
+ $(ddb_gui_GTK3_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE at am_ddb_gui_GTK3_la_rpath = \
@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE@ -rpath \
@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE@ $(pkglibdir)
@@@ -305,19 -314,58 +338,58 @@@
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at am_ddb_gui_GTK3_la_rpath = \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@ -rpath \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@ $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
+ OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
+ LTOBJCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_OBJCFLAGS) $(OBJCFLAGS)
+ AM_V_OBJC = $(am__v_OBJC_ at AM_V@)
+ am__v_OBJC_ = $(am__v_OBJC_ at AM_DEFAULT_V@)
+ am__v_OBJC_0 = @echo " OBJC " $@;
+ am__v_OBJC_1 =
+ OBJCLD = $(OBJC)
+ OBJCLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_OBJCLD = $(am__v_OBJCLD_ at AM_V@)
+ am__v_OBJCLD_ = $(am__v_OBJCLD_ at AM_DEFAULT_V@)
+ am__v_OBJCLD_0 = @echo " OBJCLD " $@;
+ am__v_OBJCLD_1 =
SOURCES = $(ddb_gui_GTK2_fallback_la_SOURCES) \
$(ddb_gui_GTK2_la_SOURCES) $(ddb_gui_GTK3_la_SOURCES)
DIST_SOURCES = $(am__ddb_gui_GTK2_fallback_la_SOURCES_DIST) \
@@@ -329,6 -377,23 +401,23 @@@ am__can_run_installinfo =
*) (install-info --version) >/dev/null 2>&1;; \
esac
HEADERS = $(sdk_HEADERS)
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -355,6 -420,7 +444,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -375,10 -441,12 +465,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -401,6 -469,7 +493,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -454,6 -523,7 +547,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -472,6 -542,8 +566,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -497,13 -569,17 +593,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -512,7 -588,9 +612,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -584,10 -662,7 +686,7 @@@ gtkuidir = $(libdir)/$(PACKAGE
#SM_CFLAGS = -DEGG_SM_CLIENT_BACKEND_XSMP -DG_LOG_DOMAIN=\""deadbeef"\"
#endif
#endif
-
- #if OS_OSX
- #OSXSRC = retina.m
- #endif
+ @OS_OSX_TRUE at osx_sources = retina.m
GTKUI_SOURCES = gtkui.c gtkui.h\
callbacks.c interface.c support.c callbacks.h interface.h support.h\
ddblistview.c ddblistview.h\
@@@ -623,13 -698,14 +722,14 @@@
sdkdir = $(pkgincludedir)
sdk_HEADERS = gtkui_api.h
EXTRA_DIST = deadbeef.glade
- GTKGLEXT2_LIBS = -lGL -lGLU
- GTKGLEXT3_LIBS =
@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE at pkglib_LTLIBRARIES = ddb_gui_GTK3.la
@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at pkglib_LTLIBRARIES = ddb_gui_GTK3.la
@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_FALSE at pkglib_LTLIBRARIES = ddb_gui_GTK2.la
@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_TRUE at pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE at pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK3.la
+
+ #GTKGLEXT2_LIBS =
+ #GTKGLEXT3_LIBS =
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE at pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la ddb_gui_GTK3.la
# normal lib
@@@ -696,15 -772,13 +796,13 @@@
# gtkglext-gtk2/gdk/glext/glext.h\
# gtkglext-gtk2/gdk/glext/glxext-extra.h\
# gtkglext-gtk2/gdk/glext/glxext.h
- @HAVE_GTK2_TRUE at GTKGLEXT_CFLAGS_GTK2 = -I at top_srcdir@/plugins/gtkui/gtkglext-gtk2 -I at top_srcdir@/plugins/gtkui/gtkglext-gtk2/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
+
+ #GTKGLEXT_CFLAGS_GTK2 = -I at top_srcdir@/plugins/gtkui/gtkglext-gtk2 -I at top_srcdir@/plugins/gtkui/gtkglext-gtk2/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
@HAVE_GTK2_TRUE at ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES_GTK2)
- @HAVE_GTK2_TRUE at ddb_gui_GTK2_la_LDFLAGS = -module
- @HAVE_GTK2_TRUE@@STATICLINK_TRUE at GTK_ROOT_216 = @top_srcdir@/$(LIB)/gtk-2.16.0
- @HAVE_GTK2_TRUE@@STATICLINK_FALSE at ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
- @HAVE_GTK2_TRUE@@STATICLINK_TRUE at ddb_gui_GTK2_la_LIBADD = $(LDADD) -L$(GTK_ROOT_216)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
- @HAVE_GTK2_TRUE@@STATICLINK_FALSE at ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2) -DDDB_WARN_DEPRECATED=1
- @HAVE_GTK2_TRUE@@STATICLINK_TRUE at ddb_gui_GTK2_la_CFLAGS = -std=c99 -I$(GTK_ROOT_216)/include/gtk-2.0 -I$(GTK_ROOT_216)/lib/gtk-2.0/include -I$(GTK_ROOT_216)/include/atk-1.0 -I$(GTK_ROOT_216)/include/cairo -I$(GTK_ROOT_216)/include/pango-1.0 -I$(GTK_ROOT_216)/include -I$(GTK_ROOT_216)/include/glib-2.0 -I$(GTK_ROOT_216)/lib/glib-2.0/include $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2)
- @HAVE_GTK3_TRUE at GTKUI_SOURCES_GTK3 = $(GTKUI_SOURCES)
+ @HAVE_GTK2_TRUE at ddb_gui_GTK2_la_LDFLAGS = -module -avoid-version
+ @HAVE_GTK2_TRUE at ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
+ @HAVE_GTK2_TRUE at ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2) -DDDB_WARN_DEPRECATED=1
+ @HAVE_GTK3_TRUE at GTKUI_SOURCES_GTK3 = $(GTKUI_SOURCES) $(osx_sources)
# gtkglext-gtk3/gtk/gtkglinit.c\
# gtkglext-gtk3/gtk/gtkglversion.c\
@@@ -764,26 -838,22 +862,22 @@@
# gtkglext-gtk3/gdk/gdkglext-config.h\
# gtkglext-gtk3/gdk/gdkglversion.h
@HAVE_GTK3_TRUE at GTKGLEXT_CFLAGS_GTK3 = -I at top_srcdir@/plugins/gtkui/gtkglext-gtk3 -I at top_srcdir@/plugins/gtkui/gtkglext-gtk3/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
- @HAVE_GTK3_TRUE at ddb_gui_GTK3_la_LDFLAGS = -module
- @HAVE_GTK3_TRUE@@STATICLINK_FALSE at ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
- @HAVE_GTK3_TRUE@@STATICLINK_TRUE at ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
- @HAVE_GTK3_TRUE@@STATICLINK_TRUE at GTK_ROOT_300 = @top_srcdir@/$(LIB)/gtk-3.0.0
- @HAVE_GTK3_TRUE@@STATICLINK_FALSE at ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT3_LIBS)
- @HAVE_GTK3_TRUE@@STATICLINK_TRUE at ddb_gui_GTK3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT3_LIBS)
- @HAVE_GTK3_TRUE@@STATICLINK_FALSE at ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
- @HAVE_GTK3_TRUE@@STATICLINK_TRUE at ddb_gui_GTK3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
- @HAVE_GTK3_TRUE@@STATICLINK_FALSE at ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
+ @HAVE_GTK3_TRUE at ddb_gui_GTK3_la_LDFLAGS = -module -avoid-version
+ @HAVE_GTK3_TRUE at ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
+ @HAVE_GTK3_TRUE at ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT3_LIBS)
+ @HAVE_GTK3_TRUE at ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
+ @HAVE_GTK3_TRUE at ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
# fallback lib
@STATICLINK_TRUE at GTK_ROOT = @top_srcdir@/$(LIB)/gtk-2.12.12/usr
@STATICLINK_TRUE at ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES_GTK2)
- @STATICLINK_TRUE at ddb_gui_GTK2_fallback_la_LDFLAGS = -module
- @STATICLINK_TRUE at ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
+ @STATICLINK_TRUE at ddb_gui_GTK2_fallback_la_LDFLAGS = -module -avoid-version
+ @STATICLINK_TRUE at ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
@STATICLINK_TRUE at ddb_gui_GTK2_fallback_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2)
all: all-am
.SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
+ .SUFFIXES: .c .lo .m .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@@ -814,6 -884,7 +908,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -840,18 -911,23 +935,23 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
ddb_gui_GTK2.fallback.la: $(ddb_gui_GTK2_fallback_la_OBJECTS) $(ddb_gui_GTK2_fallback_la_DEPENDENCIES) $(EXTRA_ddb_gui_GTK2_fallback_la_DEPENDENCIES)
- $(ddb_gui_GTK2_fallback_la_LINK) $(am_ddb_gui_GTK2_fallback_la_rpath) $(ddb_gui_GTK2_fallback_la_OBJECTS) $(ddb_gui_GTK2_fallback_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(ddb_gui_GTK2_fallback_la_LINK) $(am_ddb_gui_GTK2_fallback_la_rpath) $(ddb_gui_GTK2_fallback_la_OBJECTS) $(ddb_gui_GTK2_fallback_la_LIBADD) $(LIBS)
+
ddb_gui_GTK2.la: $(ddb_gui_GTK2_la_OBJECTS) $(ddb_gui_GTK2_la_DEPENDENCIES) $(EXTRA_ddb_gui_GTK2_la_DEPENDENCIES)
- $(ddb_gui_GTK2_la_LINK) $(am_ddb_gui_GTK2_la_rpath) $(ddb_gui_GTK2_la_OBJECTS) $(ddb_gui_GTK2_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(ddb_gui_GTK2_la_LINK) $(am_ddb_gui_GTK2_la_rpath) $(ddb_gui_GTK2_la_OBJECTS) $(ddb_gui_GTK2_la_LIBADD) $(LIBS)
+
ddb_gui_GTK3.la: $(ddb_gui_GTK3_la_OBJECTS) $(ddb_gui_GTK3_la_DEPENDENCIES) $(EXTRA_ddb_gui_GTK3_la_DEPENDENCIES)
- $(ddb_gui_GTK3_la_LINK) $(am_ddb_gui_GTK3_la_rpath) $(ddb_gui_GTK3_la_OBJECTS) $(ddb_gui_GTK3_la_LIBADD) $(LIBS)
+ $(AM_V_OBJCLD)$(ddb_gui_GTK3_la_LINK) $(am_ddb_gui_GTK3_la_rpath) $(ddb_gui_GTK3_la_OBJECTS) $(ddb_gui_GTK3_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -949,6 -1025,7 +1049,7 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-prefwin.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-progress.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-retina.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-search.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-support.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Plo at am__quote@
@@@ -957,697 -1034,725 +1058,725 @@@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ddb_gui_GTK3_la-wingeom.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
ddb_gui_GTK2_fallback_la-gtkui.lo: gtkui.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Tpo -c -o ddb_gui_GTK2_fallback_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkui.c' object='ddb_gui_GTK2_fallback_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Tpo -c -o ddb_gui_GTK2_fallback_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gtkui.c' object='ddb_gui_GTK2_fallback_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
ddb_gui_GTK2_fallback_la-callbacks.lo: callbacks.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Tpo -c -o ddb_gui_GTK2_fallback_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='callbacks.c' object='ddb_gui_GTK2_fallback_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Tpo -c -o ddb_gui_GTK2_fallback_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callbacks.c' object='ddb_gui_GTK2_fallback_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
ddb_gui_GTK2_fallback_la-interface.lo: interface.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Tpo -c -o ddb_gui_GTK2_fallback_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='interface.c' object='ddb_gui_GTK2_fallback_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Tpo -c -o ddb_gui_GTK2_fallback_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='interface.c' object='ddb_gui_GTK2_fallback_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
ddb_gui_GTK2_fallback_la-support.lo: support.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Tpo -c -o ddb_gui_GTK2_fallback_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='support.c' object='ddb_gui_GTK2_fallback_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Tpo -c -o ddb_gui_GTK2_fallback_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='support.c' object='ddb_gui_GTK2_fallback_la-support.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
ddb_gui_GTK2_fallback_la-ddblistview.lo: ddblistview.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Tpo -c -o ddb_gui_GTK2_fallback_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddblistview.c' object='ddb_gui_GTK2_fallback_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Tpo -c -o ddb_gui_GTK2_fallback_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddblistview.c' object='ddb_gui_GTK2_fallback_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
ddb_gui_GTK2_fallback_la-mainplaylist.lo: mainplaylist.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Tpo -c -o ddb_gui_GTK2_fallback_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mainplaylist.c' object='ddb_gui_GTK2_fallback_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Tpo -c -o ddb_gui_GTK2_fallback_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mainplaylist.c' object='ddb_gui_GTK2_fallback_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
ddb_gui_GTK2_fallback_la-gdkdrawing.lo: gdkdrawing.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Tpo -c -o ddb_gui_GTK2_fallback_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gdkdrawing.c' object='ddb_gui_GTK2_fallback_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Tpo -c -o ddb_gui_GTK2_fallback_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gdkdrawing.c' object='ddb_gui_GTK2_fallback_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
ddb_gui_GTK2_fallback_la-progress.lo: progress.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Tpo -c -o ddb_gui_GTK2_fallback_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='progress.c' object='ddb_gui_GTK2_fallback_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Tpo -c -o ddb_gui_GTK2_fallback_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='progress.c' object='ddb_gui_GTK2_fallback_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
ddb_gui_GTK2_fallback_la-search.lo: search.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Tpo -c -o ddb_gui_GTK2_fallback_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='search.c' object='ddb_gui_GTK2_fallback_la-search.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Tpo -c -o ddb_gui_GTK2_fallback_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='search.c' object='ddb_gui_GTK2_fallback_la-search.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
ddb_gui_GTK2_fallback_la-fileman.lo: fileman.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Tpo -c -o ddb_gui_GTK2_fallback_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fileman.c' object='ddb_gui_GTK2_fallback_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Tpo -c -o ddb_gui_GTK2_fallback_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fileman.c' object='ddb_gui_GTK2_fallback_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
ddb_gui_GTK2_fallback_la-pluginconf.lo: pluginconf.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Tpo -c -o ddb_gui_GTK2_fallback_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pluginconf.c' object='ddb_gui_GTK2_fallback_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Tpo -c -o ddb_gui_GTK2_fallback_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pluginconf.c' object='ddb_gui_GTK2_fallback_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
ddb_gui_GTK2_fallback_la-ddbtabstrip.lo: ddbtabstrip.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbtabstrip.c' object='ddb_gui_GTK2_fallback_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbtabstrip.c' object='ddb_gui_GTK2_fallback_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
ddb_gui_GTK2_fallback_la-ddbvolumebar.lo: ddbvolumebar.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbvolumebar.c' object='ddb_gui_GTK2_fallback_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbvolumebar.c' object='ddb_gui_GTK2_fallback_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
ddb_gui_GTK2_fallback_la-trkproperties.lo: trkproperties.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Tpo -c -o ddb_gui_GTK2_fallback_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trkproperties.c' object='ddb_gui_GTK2_fallback_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Tpo -c -o ddb_gui_GTK2_fallback_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='trkproperties.c' object='ddb_gui_GTK2_fallback_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
ddb_gui_GTK2_fallback_la-coverart.lo: coverart.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Tpo -c -o ddb_gui_GTK2_fallback_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coverart.c' object='ddb_gui_GTK2_fallback_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Tpo -c -o ddb_gui_GTK2_fallback_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coverart.c' object='ddb_gui_GTK2_fallback_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
ddb_gui_GTK2_fallback_la-plcommon.lo: plcommon.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Tpo -c -o ddb_gui_GTK2_fallback_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plcommon.c' object='ddb_gui_GTK2_fallback_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Tpo -c -o ddb_gui_GTK2_fallback_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plcommon.c' object='ddb_gui_GTK2_fallback_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
ddb_gui_GTK2_fallback_la-prefwin.lo: prefwin.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Tpo -c -o ddb_gui_GTK2_fallback_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='prefwin.c' object='ddb_gui_GTK2_fallback_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Tpo -c -o ddb_gui_GTK2_fallback_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='prefwin.c' object='ddb_gui_GTK2_fallback_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
ddb_gui_GTK2_fallback_la-eq.lo: eq.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Tpo -c -o ddb_gui_GTK2_fallback_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eq.c' object='ddb_gui_GTK2_fallback_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Tpo -c -o ddb_gui_GTK2_fallback_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eq.c' object='ddb_gui_GTK2_fallback_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
ddb_gui_GTK2_fallback_la-actions.lo: actions.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Tpo -c -o ddb_gui_GTK2_fallback_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='actions.c' object='ddb_gui_GTK2_fallback_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Tpo -c -o ddb_gui_GTK2_fallback_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='actions.c' object='ddb_gui_GTK2_fallback_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
ddb_gui_GTK2_fallback_la-dspconfig.lo: dspconfig.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Tpo -c -o ddb_gui_GTK2_fallback_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dspconfig.c' object='ddb_gui_GTK2_fallback_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Tpo -c -o ddb_gui_GTK2_fallback_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dspconfig.c' object='ddb_gui_GTK2_fallback_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
ddb_gui_GTK2_fallback_la-tagwritersettings.lo: tagwritersettings.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Tpo -c -o ddb_gui_GTK2_fallback_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tagwritersettings.c' object='ddb_gui_GTK2_fallback_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Tpo -c -o ddb_gui_GTK2_fallback_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tagwritersettings.c' object='ddb_gui_GTK2_fallback_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
ddb_gui_GTK2_fallback_la-wingeom.lo: wingeom.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Tpo -c -o ddb_gui_GTK2_fallback_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wingeom.c' object='ddb_gui_GTK2_fallback_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Tpo -c -o ddb_gui_GTK2_fallback_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wingeom.c' object='ddb_gui_GTK2_fallback_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
ddb_gui_GTK2_fallback_la-widgets.lo: widgets.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Tpo -c -o ddb_gui_GTK2_fallback_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='widgets.c' object='ddb_gui_GTK2_fallback_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Tpo -c -o ddb_gui_GTK2_fallback_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets.c' object='ddb_gui_GTK2_fallback_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
ddb_gui_GTK2_fallback_la-ddbseekbar.lo: ddbseekbar.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbseekbar.c' object='ddb_gui_GTK2_fallback_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbseekbar.c' object='ddb_gui_GTK2_fallback_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
ddb_gui_GTK2_fallback_la-ddbequalizer.lo: ddbequalizer.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbequalizer.c' object='ddb_gui_GTK2_fallback_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbequalizer.c' object='ddb_gui_GTK2_fallback_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo: ddbcellrenderertextmultiline.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
ddb_gui_GTK2_fallback_la-gtkuigl.lo: gtkuigl.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Tpo -c -o ddb_gui_GTK2_fallback_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkuigl.c' object='ddb_gui_GTK2_fallback_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Tpo -c -o ddb_gui_GTK2_fallback_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gtkuigl.c' object='ddb_gui_GTK2_fallback_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
ddb_gui_GTK2_fallback_la-hotkeys.lo: hotkeys.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Tpo -c -o ddb_gui_GTK2_fallback_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hotkeys.c' object='ddb_gui_GTK2_fallback_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Tpo -c -o ddb_gui_GTK2_fallback_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hotkeys.c' object='ddb_gui_GTK2_fallback_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
ddb_gui_GTK2_fallback_la-actionhandlers.lo: actionhandlers.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Tpo -c -o ddb_gui_GTK2_fallback_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='actionhandlers.c' object='ddb_gui_GTK2_fallback_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Tpo -c -o ddb_gui_GTK2_fallback_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='actionhandlers.c' object='ddb_gui_GTK2_fallback_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
ddb_gui_GTK2_fallback_la-pltmenu.lo: pltmenu.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Tpo -c -o ddb_gui_GTK2_fallback_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pltmenu.c' object='ddb_gui_GTK2_fallback_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Tpo -c -o ddb_gui_GTK2_fallback_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pltmenu.c' object='ddb_gui_GTK2_fallback_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
ddb_gui_GTK2_fallback_la-ctmapping.lo: ctmapping.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Tpo -c -o ddb_gui_GTK2_fallback_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ctmapping.c' object='ddb_gui_GTK2_fallback_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Tpo -c -o ddb_gui_GTK2_fallback_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ctmapping.c' object='ddb_gui_GTK2_fallback_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
ddb_gui_GTK2_fallback_la-namedicons.lo: namedicons.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Tpo -c -o ddb_gui_GTK2_fallback_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='namedicons.c' object='ddb_gui_GTK2_fallback_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Tpo -c -o ddb_gui_GTK2_fallback_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='namedicons.c' object='ddb_gui_GTK2_fallback_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
ddb_gui_GTK2_la-gtkui.lo: gtkui.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Tpo -c -o ddb_gui_GTK2_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkui.c' object='ddb_gui_GTK2_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Tpo -c -o ddb_gui_GTK2_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gtkui.c' object='ddb_gui_GTK2_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
ddb_gui_GTK2_la-callbacks.lo: callbacks.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Tpo -c -o ddb_gui_GTK2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='callbacks.c' object='ddb_gui_GTK2_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Tpo -c -o ddb_gui_GTK2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callbacks.c' object='ddb_gui_GTK2_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
ddb_gui_GTK2_la-interface.lo: interface.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-interface.Tpo -c -o ddb_gui_GTK2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK2_la-interface.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='interface.c' object='ddb_gui_GTK2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-interface.Tpo -c -o ddb_gui_GTK2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK2_la-interface.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='interface.c' object='ddb_gui_GTK2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
ddb_gui_GTK2_la-support.lo: support.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-support.Tpo -c -o ddb_gui_GTK2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-support.Tpo $(DEPDIR)/ddb_gui_GTK2_la-support.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='support.c' object='ddb_gui_GTK2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-support.Tpo -c -o ddb_gui_GTK2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-support.Tpo $(DEPDIR)/ddb_gui_GTK2_la-support.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='support.c' object='ddb_gui_GTK2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
ddb_gui_GTK2_la-ddblistview.lo: ddblistview.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Tpo -c -o ddb_gui_GTK2_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddblistview.c' object='ddb_gui_GTK2_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Tpo -c -o ddb_gui_GTK2_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddblistview.c' object='ddb_gui_GTK2_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
ddb_gui_GTK2_la-mainplaylist.lo: mainplaylist.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Tpo -c -o ddb_gui_GTK2_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mainplaylist.c' object='ddb_gui_GTK2_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Tpo -c -o ddb_gui_GTK2_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mainplaylist.c' object='ddb_gui_GTK2_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
ddb_gui_GTK2_la-gdkdrawing.lo: gdkdrawing.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Tpo -c -o ddb_gui_GTK2_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gdkdrawing.c' object='ddb_gui_GTK2_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Tpo -c -o ddb_gui_GTK2_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gdkdrawing.c' object='ddb_gui_GTK2_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
ddb_gui_GTK2_la-progress.lo: progress.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-progress.Tpo -c -o ddb_gui_GTK2_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK2_la-progress.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='progress.c' object='ddb_gui_GTK2_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-progress.Tpo -c -o ddb_gui_GTK2_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK2_la-progress.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='progress.c' object='ddb_gui_GTK2_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
ddb_gui_GTK2_la-search.lo: search.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-search.Tpo -c -o ddb_gui_GTK2_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-search.Tpo $(DEPDIR)/ddb_gui_GTK2_la-search.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='search.c' object='ddb_gui_GTK2_la-search.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-search.Tpo -c -o ddb_gui_GTK2_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-search.Tpo $(DEPDIR)/ddb_gui_GTK2_la-search.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='search.c' object='ddb_gui_GTK2_la-search.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
ddb_gui_GTK2_la-fileman.lo: fileman.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-fileman.Tpo -c -o ddb_gui_GTK2_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK2_la-fileman.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fileman.c' object='ddb_gui_GTK2_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-fileman.Tpo -c -o ddb_gui_GTK2_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK2_la-fileman.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fileman.c' object='ddb_gui_GTK2_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
ddb_gui_GTK2_la-pluginconf.lo: pluginconf.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Tpo -c -o ddb_gui_GTK2_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pluginconf.c' object='ddb_gui_GTK2_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Tpo -c -o ddb_gui_GTK2_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pluginconf.c' object='ddb_gui_GTK2_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
ddb_gui_GTK2_la-ddbtabstrip.lo: ddbtabstrip.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK2_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbtabstrip.c' object='ddb_gui_GTK2_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK2_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbtabstrip.c' object='ddb_gui_GTK2_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
ddb_gui_GTK2_la-ddbvolumebar.lo: ddbvolumebar.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK2_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbvolumebar.c' object='ddb_gui_GTK2_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK2_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbvolumebar.c' object='ddb_gui_GTK2_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
ddb_gui_GTK2_la-trkproperties.lo: trkproperties.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Tpo -c -o ddb_gui_GTK2_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trkproperties.c' object='ddb_gui_GTK2_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Tpo -c -o ddb_gui_GTK2_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='trkproperties.c' object='ddb_gui_GTK2_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
ddb_gui_GTK2_la-coverart.lo: coverart.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-coverart.Tpo -c -o ddb_gui_GTK2_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK2_la-coverart.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coverart.c' object='ddb_gui_GTK2_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-coverart.Tpo -c -o ddb_gui_GTK2_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK2_la-coverart.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coverart.c' object='ddb_gui_GTK2_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
ddb_gui_GTK2_la-plcommon.lo: plcommon.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Tpo -c -o ddb_gui_GTK2_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plcommon.c' object='ddb_gui_GTK2_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Tpo -c -o ddb_gui_GTK2_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plcommon.c' object='ddb_gui_GTK2_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
ddb_gui_GTK2_la-prefwin.lo: prefwin.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Tpo -c -o ddb_gui_GTK2_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='prefwin.c' object='ddb_gui_GTK2_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Tpo -c -o ddb_gui_GTK2_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='prefwin.c' object='ddb_gui_GTK2_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
ddb_gui_GTK2_la-eq.lo: eq.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-eq.Tpo -c -o ddb_gui_GTK2_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK2_la-eq.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eq.c' object='ddb_gui_GTK2_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-eq.Tpo -c -o ddb_gui_GTK2_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK2_la-eq.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eq.c' object='ddb_gui_GTK2_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
ddb_gui_GTK2_la-actions.lo: actions.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-actions.Tpo -c -o ddb_gui_GTK2_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK2_la-actions.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='actions.c' object='ddb_gui_GTK2_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-actions.Tpo -c -o ddb_gui_GTK2_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK2_la-actions.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='actions.c' object='ddb_gui_GTK2_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
ddb_gui_GTK2_la-dspconfig.lo: dspconfig.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Tpo -c -o ddb_gui_GTK2_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dspconfig.c' object='ddb_gui_GTK2_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Tpo -c -o ddb_gui_GTK2_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dspconfig.c' object='ddb_gui_GTK2_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
ddb_gui_GTK2_la-tagwritersettings.lo: tagwritersettings.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Tpo -c -o ddb_gui_GTK2_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tagwritersettings.c' object='ddb_gui_GTK2_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Tpo -c -o ddb_gui_GTK2_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tagwritersettings.c' object='ddb_gui_GTK2_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
ddb_gui_GTK2_la-wingeom.lo: wingeom.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Tpo -c -o ddb_gui_GTK2_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wingeom.c' object='ddb_gui_GTK2_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Tpo -c -o ddb_gui_GTK2_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wingeom.c' object='ddb_gui_GTK2_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
ddb_gui_GTK2_la-widgets.lo: widgets.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-widgets.Tpo -c -o ddb_gui_GTK2_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK2_la-widgets.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='widgets.c' object='ddb_gui_GTK2_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-widgets.Tpo -c -o ddb_gui_GTK2_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK2_la-widgets.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets.c' object='ddb_gui_GTK2_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
ddb_gui_GTK2_la-ddbseekbar.lo: ddbseekbar.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Tpo -c -o ddb_gui_GTK2_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbseekbar.c' object='ddb_gui_GTK2_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Tpo -c -o ddb_gui_GTK2_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbseekbar.c' object='ddb_gui_GTK2_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
ddb_gui_GTK2_la-ddbequalizer.lo: ddbequalizer.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Tpo -c -o ddb_gui_GTK2_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbequalizer.c' object='ddb_gui_GTK2_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Tpo -c -o ddb_gui_GTK2_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbequalizer.c' object='ddb_gui_GTK2_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo: ddbcellrenderertextmultiline.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
ddb_gui_GTK2_la-gtkuigl.lo: gtkuigl.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Tpo -c -o ddb_gui_GTK2_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkuigl.c' object='ddb_gui_GTK2_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Tpo -c -o ddb_gui_GTK2_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gtkuigl.c' object='ddb_gui_GTK2_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
ddb_gui_GTK2_la-hotkeys.lo: hotkeys.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Tpo -c -o ddb_gui_GTK2_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hotkeys.c' object='ddb_gui_GTK2_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Tpo -c -o ddb_gui_GTK2_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hotkeys.c' object='ddb_gui_GTK2_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
ddb_gui_GTK2_la-actionhandlers.lo: actionhandlers.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Tpo -c -o ddb_gui_GTK2_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='actionhandlers.c' object='ddb_gui_GTK2_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Tpo -c -o ddb_gui_GTK2_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='actionhandlers.c' object='ddb_gui_GTK2_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
ddb_gui_GTK2_la-pltmenu.lo: pltmenu.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Tpo -c -o ddb_gui_GTK2_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pltmenu.c' object='ddb_gui_GTK2_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Tpo -c -o ddb_gui_GTK2_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pltmenu.c' object='ddb_gui_GTK2_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
ddb_gui_GTK2_la-ctmapping.lo: ctmapping.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Tpo -c -o ddb_gui_GTK2_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ctmapping.c' object='ddb_gui_GTK2_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Tpo -c -o ddb_gui_GTK2_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ctmapping.c' object='ddb_gui_GTK2_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
ddb_gui_GTK2_la-namedicons.lo: namedicons.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Tpo -c -o ddb_gui_GTK2_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='namedicons.c' object='ddb_gui_GTK2_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Tpo -c -o ddb_gui_GTK2_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='namedicons.c' object='ddb_gui_GTK2_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
ddb_gui_GTK3_la-gtkui.lo: gtkui.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Tpo -c -o ddb_gui_GTK3_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkui.c' object='ddb_gui_GTK3_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Tpo -c -o ddb_gui_GTK3_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gtkui.c' object='ddb_gui_GTK3_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
ddb_gui_GTK3_la-callbacks.lo: callbacks.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Tpo -c -o ddb_gui_GTK3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='callbacks.c' object='ddb_gui_GTK3_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Tpo -c -o ddb_gui_GTK3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callbacks.c' object='ddb_gui_GTK3_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
ddb_gui_GTK3_la-interface.lo: interface.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-interface.Tpo -c -o ddb_gui_GTK3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK3_la-interface.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='interface.c' object='ddb_gui_GTK3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-interface.Tpo -c -o ddb_gui_GTK3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK3_la-interface.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='interface.c' object='ddb_gui_GTK3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
ddb_gui_GTK3_la-support.lo: support.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-support.Tpo -c -o ddb_gui_GTK3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-support.Tpo $(DEPDIR)/ddb_gui_GTK3_la-support.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='support.c' object='ddb_gui_GTK3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-support.Tpo -c -o ddb_gui_GTK3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-support.Tpo $(DEPDIR)/ddb_gui_GTK3_la-support.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='support.c' object='ddb_gui_GTK3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
ddb_gui_GTK3_la-ddblistview.lo: ddblistview.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Tpo -c -o ddb_gui_GTK3_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddblistview.c' object='ddb_gui_GTK3_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Tpo -c -o ddb_gui_GTK3_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddblistview.c' object='ddb_gui_GTK3_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
ddb_gui_GTK3_la-mainplaylist.lo: mainplaylist.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Tpo -c -o ddb_gui_GTK3_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mainplaylist.c' object='ddb_gui_GTK3_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Tpo -c -o ddb_gui_GTK3_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mainplaylist.c' object='ddb_gui_GTK3_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
ddb_gui_GTK3_la-gdkdrawing.lo: gdkdrawing.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Tpo -c -o ddb_gui_GTK3_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gdkdrawing.c' object='ddb_gui_GTK3_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Tpo -c -o ddb_gui_GTK3_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gdkdrawing.c' object='ddb_gui_GTK3_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
ddb_gui_GTK3_la-progress.lo: progress.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-progress.Tpo -c -o ddb_gui_GTK3_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK3_la-progress.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='progress.c' object='ddb_gui_GTK3_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-progress.Tpo -c -o ddb_gui_GTK3_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK3_la-progress.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='progress.c' object='ddb_gui_GTK3_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
ddb_gui_GTK3_la-search.lo: search.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-search.Tpo -c -o ddb_gui_GTK3_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-search.Tpo $(DEPDIR)/ddb_gui_GTK3_la-search.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='search.c' object='ddb_gui_GTK3_la-search.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-search.Tpo -c -o ddb_gui_GTK3_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-search.Tpo $(DEPDIR)/ddb_gui_GTK3_la-search.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='search.c' object='ddb_gui_GTK3_la-search.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
ddb_gui_GTK3_la-fileman.lo: fileman.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-fileman.Tpo -c -o ddb_gui_GTK3_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK3_la-fileman.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fileman.c' object='ddb_gui_GTK3_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-fileman.Tpo -c -o ddb_gui_GTK3_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK3_la-fileman.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fileman.c' object='ddb_gui_GTK3_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
ddb_gui_GTK3_la-pluginconf.lo: pluginconf.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Tpo -c -o ddb_gui_GTK3_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pluginconf.c' object='ddb_gui_GTK3_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Tpo -c -o ddb_gui_GTK3_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pluginconf.c' object='ddb_gui_GTK3_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
ddb_gui_GTK3_la-ddbtabstrip.lo: ddbtabstrip.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK3_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbtabstrip.c' object='ddb_gui_GTK3_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK3_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbtabstrip.c' object='ddb_gui_GTK3_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
ddb_gui_GTK3_la-ddbvolumebar.lo: ddbvolumebar.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK3_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbvolumebar.c' object='ddb_gui_GTK3_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK3_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbvolumebar.c' object='ddb_gui_GTK3_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
ddb_gui_GTK3_la-trkproperties.lo: trkproperties.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Tpo -c -o ddb_gui_GTK3_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trkproperties.c' object='ddb_gui_GTK3_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Tpo -c -o ddb_gui_GTK3_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='trkproperties.c' object='ddb_gui_GTK3_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
ddb_gui_GTK3_la-coverart.lo: coverart.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-coverart.Tpo -c -o ddb_gui_GTK3_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK3_la-coverart.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coverart.c' object='ddb_gui_GTK3_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-coverart.Tpo -c -o ddb_gui_GTK3_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK3_la-coverart.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coverart.c' object='ddb_gui_GTK3_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
ddb_gui_GTK3_la-plcommon.lo: plcommon.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Tpo -c -o ddb_gui_GTK3_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plcommon.c' object='ddb_gui_GTK3_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Tpo -c -o ddb_gui_GTK3_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plcommon.c' object='ddb_gui_GTK3_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
ddb_gui_GTK3_la-prefwin.lo: prefwin.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Tpo -c -o ddb_gui_GTK3_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='prefwin.c' object='ddb_gui_GTK3_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Tpo -c -o ddb_gui_GTK3_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='prefwin.c' object='ddb_gui_GTK3_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
ddb_gui_GTK3_la-eq.lo: eq.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-eq.Tpo -c -o ddb_gui_GTK3_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK3_la-eq.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eq.c' object='ddb_gui_GTK3_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-eq.Tpo -c -o ddb_gui_GTK3_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK3_la-eq.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eq.c' object='ddb_gui_GTK3_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
ddb_gui_GTK3_la-actions.lo: actions.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-actions.Tpo -c -o ddb_gui_GTK3_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK3_la-actions.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='actions.c' object='ddb_gui_GTK3_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-actions.Tpo -c -o ddb_gui_GTK3_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK3_la-actions.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='actions.c' object='ddb_gui_GTK3_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
ddb_gui_GTK3_la-dspconfig.lo: dspconfig.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Tpo -c -o ddb_gui_GTK3_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dspconfig.c' object='ddb_gui_GTK3_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Tpo -c -o ddb_gui_GTK3_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dspconfig.c' object='ddb_gui_GTK3_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
ddb_gui_GTK3_la-tagwritersettings.lo: tagwritersettings.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Tpo -c -o ddb_gui_GTK3_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tagwritersettings.c' object='ddb_gui_GTK3_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Tpo -c -o ddb_gui_GTK3_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tagwritersettings.c' object='ddb_gui_GTK3_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
ddb_gui_GTK3_la-wingeom.lo: wingeom.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Tpo -c -o ddb_gui_GTK3_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wingeom.c' object='ddb_gui_GTK3_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Tpo -c -o ddb_gui_GTK3_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wingeom.c' object='ddb_gui_GTK3_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
ddb_gui_GTK3_la-widgets.lo: widgets.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-widgets.Tpo -c -o ddb_gui_GTK3_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK3_la-widgets.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='widgets.c' object='ddb_gui_GTK3_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-widgets.Tpo -c -o ddb_gui_GTK3_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK3_la-widgets.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets.c' object='ddb_gui_GTK3_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
ddb_gui_GTK3_la-ddbseekbar.lo: ddbseekbar.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Tpo -c -o ddb_gui_GTK3_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbseekbar.c' object='ddb_gui_GTK3_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Tpo -c -o ddb_gui_GTK3_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbseekbar.c' object='ddb_gui_GTK3_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
ddb_gui_GTK3_la-ddbequalizer.lo: ddbequalizer.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Tpo -c -o ddb_gui_GTK3_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbequalizer.c' object='ddb_gui_GTK3_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Tpo -c -o ddb_gui_GTK3_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbequalizer.c' object='ddb_gui_GTK3_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo: ddbcellrenderertextmultiline.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
ddb_gui_GTK3_la-gtkuigl.lo: gtkuigl.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Tpo -c -o ddb_gui_GTK3_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkuigl.c' object='ddb_gui_GTK3_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Tpo -c -o ddb_gui_GTK3_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gtkuigl.c' object='ddb_gui_GTK3_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
ddb_gui_GTK3_la-hotkeys.lo: hotkeys.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Tpo -c -o ddb_gui_GTK3_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hotkeys.c' object='ddb_gui_GTK3_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Tpo -c -o ddb_gui_GTK3_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hotkeys.c' object='ddb_gui_GTK3_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
ddb_gui_GTK3_la-actionhandlers.lo: actionhandlers.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Tpo -c -o ddb_gui_GTK3_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='actionhandlers.c' object='ddb_gui_GTK3_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Tpo -c -o ddb_gui_GTK3_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='actionhandlers.c' object='ddb_gui_GTK3_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
ddb_gui_GTK3_la-pltmenu.lo: pltmenu.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Tpo -c -o ddb_gui_GTK3_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pltmenu.c' object='ddb_gui_GTK3_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Tpo -c -o ddb_gui_GTK3_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pltmenu.c' object='ddb_gui_GTK3_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
ddb_gui_GTK3_la-ctmapping.lo: ctmapping.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Tpo -c -o ddb_gui_GTK3_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ctmapping.c' object='ddb_gui_GTK3_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Tpo -c -o ddb_gui_GTK3_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ctmapping.c' object='ddb_gui_GTK3_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
ddb_gui_GTK3_la-namedicons.lo: namedicons.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Tpo -c -o ddb_gui_GTK3_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='namedicons.c' object='ddb_gui_GTK3_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Tpo -c -o ddb_gui_GTK3_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='namedicons.c' object='ddb_gui_GTK3_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+
+ .m.o:
+ @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepOBJC_FALSE@ $(AM_V_OBJC at am__nodep@)$(OBJCCOMPILE) -c -o $@ $<
+
+ .m.obj:
+ @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepOBJC_FALSE@ $(AM_V_OBJC at am__nodep@)$(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .m.lo:
+ @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(LTOBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepOBJC_FALSE@ $(AM_V_OBJC at am__nodep@)$(LTOBJCCOMPILE) -c -o $@ $<
+
+ ddb_gui_GTK3_la-retina.lo: retina.m
+ @am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_OBJCFLAGS) $(OBJCFLAGS) -MT ddb_gui_GTK3_la-retina.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-retina.Tpo -c -o ddb_gui_GTK3_la-retina.lo `test -f 'retina.m' || echo '$(srcdir)/'`retina.m
+ @am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-retina.Tpo $(DEPDIR)/ddb_gui_GTK3_la-retina.Plo
+ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='retina.m' object='ddb_gui_GTK3_la-retina.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepOBJC_FALSE@ $(AM_V_OBJC at am__nodep@)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_OBJCFLAGS) $(OBJCFLAGS) -c -o ddb_gui_GTK3_la-retina.lo `test -f 'retina.m' || echo '$(srcdir)/'`retina.m
mostlyclean-libtool:
-rm -f *.lo
@@@ -1676,26 -1781,15 +1805,15 @@@ uninstall-sdkHEADERS
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(sdkdir)'; $(am__uninstall_files_from_dir)
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -1707,15 -1801,11 +1825,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -1724,6 -1814,21 +1838,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -1868,20 -1973,20 +1997,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-sdkHEADERS install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES \
- uninstall-sdkHEADERS
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-sdkHEADERS install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-pkglibLTLIBRARIES uninstall-sdkHEADERS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/gtkui/actionhandlers.c
index ade7434,99a658b..db12893
--- a/plugins/gtkui/actionhandlers.c
+++ b/plugins/gtkui/actionhandlers.c
@@@ -39,6 -39,9 +39,12 @@@
#include "trkproperties.h"
#include "callbacks.h"
#include <sys/stat.h>
++<<<<<<< HEAD
++=======
+
+ // disable custom title function, until we have new title formatting (0.7)
+ #define DISABLE_CUSTOM_TITLE
++>>>>>>> upstream/0.6.2
extern GtkWidget *mainwin;
extern DB_functions_t *deadbeef;
@@@ -390,9 -393,42 +396,42 @@@ action_hide_mainwin_handler (struct DB_
return 0;
}
+ static void
+ on_toggle_set_custom_title (GtkToggleButton *togglebutton, gpointer user_data) {
+ gboolean active = gtk_toggle_button_get_active (togglebutton);
+ deadbeef->conf_set_int ("gtkui.location_set_custom_title", active);
+
+ GtkWidget *ct = lookup_widget (GTK_WIDGET (user_data), "custom_title");
+ gtk_widget_set_sensitive (ct, active);
+
+ deadbeef->conf_save ();
+ }
+
gboolean
action_add_location_handler_cb (void *user_data) {
GtkWidget *dlg = create_addlocationdlg ();
+
+ GtkWidget *sct = lookup_widget (dlg, "set_custom_title");
+ GtkWidget *ct = lookup_widget (dlg, "custom_title");
+
+ #ifndef DISABLE_CUSTOM_TITLE
+ if (deadbeef->conf_get_int ("gtkui.location_set_custom_title", 0)) {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sct), TRUE);
+ gtk_widget_set_sensitive (ct, TRUE);
+ }
+ else
+ #endif
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sct), FALSE);
+ gtk_widget_set_sensitive (ct, FALSE);
+ }
+
+ #ifndef DISABLE_CUSTOM_TITLE
+ g_signal_connect ((gpointer) sct, "toggled",
+ G_CALLBACK (on_toggle_set_custom_title),
+ dlg);
+ #endif
+
gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
int res = gtk_dialog_run (GTK_DIALOG (dlg));
if (res == GTK_RESPONSE_OK) {
@@@ -402,7 -438,16 +441,16 @@@
if (text) {
ddb_playlist_t *plt = deadbeef->plt_get_curr ();
if (!deadbeef->plt_add_files_begin (plt, 0)) {
- deadbeef->plt_add_file2 (0, plt, text, NULL, NULL);
+ DB_playItem_t *tail = deadbeef->plt_get_last (plt, PL_MAIN);
+ DB_playItem_t *it = deadbeef->plt_insert_file2 (0, plt, tail, text, NULL, NULL, NULL);
+ #ifndef DISABLE_CUSTOM_TITLE
+ if (it && deadbeef->conf_get_int ("gtkui.location_set_custom_title", 0)) {
+ deadbeef->pl_replace_meta (it, ":CUSTOM_TITLE", gtk_entry_get_text (GTK_ENTRY (ct)));
+ }
+ #endif
+ if (tail) {
+ deadbeef->pl_item_unref (tail);
+ }
deadbeef->plt_add_files_end (plt, 0);
playlist_refresh ();
}
@@@ -662,13 -707,13 +710,13 @@@ load_playlist_thread (void *data)
char *fname = data;
ddb_playlist_t *plt = deadbeef->plt_get_curr ();
if (plt) {
- deadbeef->plt_clear (plt);
- int abort = 0;
- DB_playItem_t *it = deadbeef->plt_load2 (0, plt, NULL, fname, &abort, NULL, NULL);
- if (it) {
- deadbeef->pl_item_unref (it);
+ if (!deadbeef->plt_add_files_begin (plt, 0)) {
+ deadbeef->plt_clear (plt);
+ int abort = 0;
+ DB_playItem_t *it = deadbeef->plt_load2 (0, plt, NULL, fname, &abort, NULL, NULL);
+ deadbeef->plt_save_config (plt);
+ deadbeef->plt_add_files_end (plt, 0);
}
- deadbeef->plt_save_config (plt);
deadbeef->plt_unref (plt);
}
g_free (fname);
@@@ -956,6 -1001,7 +1004,7 @@@ action_hide_eq_handler(DB_plugin_action
gboolean
action_playback_loop_off_handler_cb (void *data) {
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "loop_disable")), 1);
+ return FALSE;
}
int
@@@ -967,6 -1013,7 +1016,7 @@@ action_playback_loop_off_handler(DB_plu
gboolean
action_playback_loop_single_handler_cb (void *data) {
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "loop_single")), 1);
+ return FALSE;
}
int
@@@ -978,6 -1025,7 +1028,7 @@@ action_playback_loop_single_handler(DB_
gboolean
action_playback_loop_all_handler_cb (void *data) {
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "loop_all")), 1);
+ return FALSE;
}
int
@@@ -989,6 -1037,7 +1040,7 @@@ action_playback_loop_all_handler(DB_plu
gboolean
action_playback_order_random_handler_cb (void *data) {
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_random")), 1);
+ return FALSE;
}
int
@@@ -1000,6 -1049,7 +1052,7 @@@ action_playback_order_random_handler(DB
gboolean
action_playback_order_shuffle_albums_handler_cb (void *data) {
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_shuffle_albums")), 1);
+ return FALSE;
}
int
@@@ -1011,6 -1061,7 +1064,7 @@@ action_playback_order_shuffle_albums_ha
gboolean
action_playback_order_shuffle_handler_cb (void *data) {
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_shuffle")), 1);
+ return FALSE;
}
int
@@@ -1022,6 -1073,7 +1076,7 @@@ action_playback_order_shuffle_handler(D
gboolean
action_playback_order_linear_handler_cb (void *data) {
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_linear")), 1);
+ return FALSE;
}
int
@@@ -1047,6 -1099,7 +1102,7 @@@ action_playback_order_cycle_handler_cb
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_linear")), 1);
break;
}
+ return FALSE;
}
int
@@@ -1069,6 -1122,7 +1125,7 @@@ action_playback_loop_cycle_handler_cb (
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "loop_all")), 1);
break;
}
+ return FALSE;
}
int
diff --combined plugins/gtkui/ddblistview.c
index 70fec5b,a79a5ab..fa308f8
--- a/plugins/gtkui/ddblistview.c
+++ b/plugins/gtkui/ddblistview.c
@@@ -1,5 -1,5 +1,5 @@@
/*
- DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+ DeaDBeeF - The Ultimate Music Player
Copyright (C) 2009-2013 Alexey Yakovenko <waker at users.sourceforge.net>
This program is free software: you can redistribute it and/or modify
@@@ -79,6 -79,8 +79,8 @@@ static void ddb_listview_destroy(GObjec
void
ddb_listview_build_groups (DdbListview *listview);
+ static void
+ ddb_listview_resize_groups (DdbListview *listview);
// fwd decls
void
ddb_listview_free_groups (DdbListview *listview);
@@@ -94,6 -96,8 +96,8 @@@ ddb_listview_list_render_row_backgroun
void
ddb_listview_list_render_row_foreground (DdbListview *ps, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int even, int cursor, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int w, int h);
void
+ ddb_listview_list_render_album_art (DdbListview *ps, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int w, int h);
+ void
ddb_listview_list_track_dragdrop (DdbListview *ps, int y);
int
ddb_listview_dragdrop_get_row_from_coord (DdbListview *listview, int y);
@@@ -200,6 -204,9 +204,9 @@@ ddb_listview_list_button_press_even
gpointer user_data);
gboolean
+ ddb_listview_list_popup_menu (GtkWidget *widget, gpointer user_data);
+
+ gboolean
ddb_listview_list_drag_motion (GtkWidget *widget,
GdkDragContext *drag_context,
gint x,
@@@ -291,6 -298,9 +298,9 @@@ ddb_listview_init(DdbListview *listview
listview->col_movepos = -1;
listview->drag_motion_y = -1;
+ listview->ref_point = -1;
+ listview->ref_point_offset = -1;
+
listview->scroll_mode = 0;
listview->scroll_pointer_y = -1;
listview->scroll_direction = 0;
@@@ -439,6 -449,9 +449,9 @@@
g_signal_connect_after ((gpointer) listview->list, "button_press_event",
G_CALLBACK (ddb_listview_list_button_press_event),
NULL);
+ g_signal_connect ((gpointer) listview->list, "popup_menu",
+ G_CALLBACK (ddb_listview_list_popup_menu),
+ NULL);
g_signal_connect ((gpointer) listview->list, "scroll_event",
G_CALLBACK (ddb_listview_vscroll_event),
NULL);
@@@ -602,6 -615,44 +615,44 @@@ ddb_listview_groupcheck (DdbListview *l
}
}
+ // returns 1 if X coordinate in list belongs to album art column and 0 if not
+ int
+ ddb_listview_is_album_art_column (DdbListview *listview, int x)
+ {
+ int album_art_column = 0;
+ int col_x = -listview->hscrollpos;
+ int cnt = ddb_listview_column_get_count (listview);
+ for (int i = 0; i < cnt, col_x <= x; i++) {
+ const char *title;
+ int width;
+ int align_right;
+ col_info_t *info;
+ int minheight;
+ int res = ddb_listview_column_get_info (listview, i, &title, &width, &align_right, &minheight, (void **)&info);
+ if (res != -1 && x <= col_x + width && info->id == DB_COLUMN_ALBUM_ART) {
+ return 1;
+ }
+ col_x += width;
+ }
+ return 0;
+ }
+
+ // returns 1 if column is album art column
+ int
+ ddb_listview_is_album_art_column_idx (DdbListview *listview, int cidx)
+ {
+ const char *title;
+ int width;
+ int align_right;
+ col_info_t *info;
+ int minheight;
+ int res = ddb_listview_column_get_info (listview, cidx, &title, &width, &align_right, &minheight, (void **)&info);
+ if (res != -1 && info->id == DB_COLUMN_ALBUM_ART) {
+ return 1;
+ }
+ return 0;
+ }
+
// returns Y coordinate of an item by its index
int
ddb_listview_get_row_pos (DdbListview *listview, int row_idx) {
@@@ -642,7 -693,7 +693,7 @@@ ddb_listview_list_pickpoint_y (DdbListv
y -= grp_y;
if (y < listview->grouptitle_height) {
*group_idx = -1;
- *global_idx = -1;
+ *global_idx = idx;
}
else if (y >= listview->grouptitle_height + grp->num_items * listview->rowheight) {
*group_idx = (y - listview->grouptitle_height) / listview->rowheight;
@@@ -712,9 -763,10 +763,10 @@@ ddb_listview_list_render (DdbListview *
int ii = 0;
while (grp && grp_y < y + h + listview->scrollpos) {
+ int grp_height = listview->grouptitle_height + grp->num_items * listview->rowheight;
// render title
DdbListviewIter it = grp->head;
- int grpheight = grp->height;
+ int grp_height_total = grp->height;
int pushback = 0;
int group_idx = idx;
@@@ -729,23 -781,24 +781,24 @@@
}
}
+ grp_next_y = grp_y + grp_height_total;
for (int i = 0; i < grp->num_items; i++) {
ii++;
- if (grp_y + listview->grouptitle_height + i * listview->rowheight >= y + h + listview->scrollpos) {
+ int grp_row_y = grp_y + listview->grouptitle_height + i * listview->rowheight;
+ if (grp_row_y >= y + h + listview->scrollpos) {
break;
}
- grp_next_y = grp_y + grpheight;
if (grp->pinned == 1 && gtkui_groups_pinned && grp_next_y - listview->scrollpos <= listview->grouptitle_height) {
pushback = listview->grouptitle_height - (grp_next_y - listview->scrollpos);
}
if (grp_y + listview->grouptitle_height + (i+1) * listview->rowheight >= y + listview->scrollpos
- && grp_y + listview->grouptitle_height + i * listview->rowheight < y + h + listview->scrollpos) {
+ && grp_row_y < y + h + listview->scrollpos) {
GtkStyle *st = gtk_widget_get_style (listview->list);
gdk_cairo_set_source_color (cr, &st->bg[GTK_STATE_NORMAL]);
- cairo_rectangle (cr, -listview->hscrollpos, grp_y + listview->grouptitle_height + i * listview->rowheight - listview->scrollpos, listview->totalwidth, listview->rowheight);
+ cairo_rectangle (cr, -listview->hscrollpos, grp_row_y - listview->scrollpos, listview->totalwidth, listview->rowheight);
cairo_fill (cr);
- ddb_listview_list_render_row_background (listview, cr, it, (idx + 1 + i) & 1, (abs_idx+i) == listview->binding->cursor () ? 1 : 0, -listview->hscrollpos, grp_y + listview->grouptitle_height + i * listview->rowheight - listview->scrollpos, listview->totalwidth, listview->rowheight);
- ddb_listview_list_render_row_foreground (listview, cr, it, grp->head, (idx + 1 + i) & 1, (idx+i) == listview->binding->cursor () ? 1 : 0, i * listview->rowheight, grp->height, grp->pinned, grp_next_y - listview->scrollpos, -listview->hscrollpos, grp_y + listview->grouptitle_height + i * listview->rowheight - listview->scrollpos, listview->totalwidth, listview->rowheight);
+ ddb_listview_list_render_row_background (listview, cr, it, (idx + 1 + i) & 1, (abs_idx+i) == listview->binding->cursor () ? 1 : 0, -listview->hscrollpos, grp_row_y - listview->scrollpos, listview->totalwidth, listview->rowheight);
+ ddb_listview_list_render_row_foreground (listview, cr, it, grp->head, (idx + 1 + i) & 1, (idx+i) == listview->binding->cursor () ? 1 : 0, i * listview->rowheight, grp->height, grp->pinned, grp_next_y - listview->scrollpos, -listview->hscrollpos, grp_row_y - listview->scrollpos, listview->totalwidth, listview->rowheight);
}
DdbListviewIter next = listview->binding->next (it);
listview->binding->unref (it);
@@@ -754,49 -807,47 +807,47 @@@
break; // sanity check, in case groups were not rebuilt yet
}
}
- if (grp->pinned == 1 && gtkui_groups_pinned && y <= 0) {
- ddb_listview_list_render_row_background (listview, cr, NULL, group_idx & 1, 0, -listview->hscrollpos, y, listview->totalwidth, listview->grouptitle_height);
- if (listview->binding->draw_group_title && listview->grouptitle_height > 0) {
- listview->binding->draw_group_title (listview, cr, grp->head, -listview->hscrollpos, y - pushback, listview->totalwidth, listview->grouptitle_height);
- }
- }
-
idx += grp->num_items + 1;
abs_idx += grp->num_items;
DdbListviewIter prev = listview->binding->prev (it);
- int filler = grpheight - (listview->grouptitle_height + listview->rowheight * grp->num_items);
+ int filler = grp_height_total - (grp_height);
if (filler > 0) {
int theming = !gtkui_override_listview_colors ();
if (theming) {
#if GTK_CHECK_VERSION(3,0,0)
- gtk_paint_flat_box (gtk_widget_get_style (treeview), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, treeview, "cell_even_ruled", x, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, w, filler);
+ gtk_paint_flat_box (gtk_widget_get_style (treeview), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, treeview, "cell_even_ruled", x, grp_y - listview->scrollpos + grp_height, w, filler);
#else
- gtk_paint_flat_box (gtk_widget_get_style (treeview), gtk_widget_get_window (listview->list), GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, treeview, "cell_even_ruled", x, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, w, filler);
+ gtk_paint_flat_box (gtk_widget_get_style (treeview), gtk_widget_get_window (listview->list), GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, treeview, "cell_even_ruled", x, grp_y - listview->scrollpos + grp_height, w, filler);
#endif
}
else {
GdkColor clr;
gtkui_get_listview_even_row_color (&clr);
gdk_cairo_set_source_color (cr, &clr);
- cairo_rectangle (cr, x, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, w, filler);
+ cairo_rectangle (cr, x, grp_y - listview->scrollpos + grp_height, w, filler);
cairo_fill (cr);
}
- ddb_listview_list_render_row_foreground (listview, cr, NULL, grp->head, 0, 0, grp->num_items * listview->rowheight, grp->height, grp->pinned, grp_next_y - listview->scrollpos, -listview->hscrollpos, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, listview->totalwidth, filler);
- if (grp->pinned == 1 && gtkui_groups_pinned && y <= 0) {
- ddb_listview_list_render_row_background (listview, cr, NULL, group_idx & 1, 0, -listview->hscrollpos, y, listview->totalwidth, listview->grouptitle_height);
- if (listview->binding->draw_group_title && listview->grouptitle_height > 0) {
- listview->binding->draw_group_title (listview, cr, prev, -listview->hscrollpos, y - pushback, listview->totalwidth, listview->grouptitle_height);
- }
+ //ddb_listview_list_render_row_foreground (listview, cr, NULL, grp->head, 0, 0, grp->num_items * listview->rowheight, grp->height, grp->pinned, grp_next_y - listview->scrollpos, -listview->hscrollpos, grp_y - listview->scrollpos + grp_height, listview->totalwidth, filler);
+ }
+
+ // draw album art
+ ddb_listview_list_render_album_art (listview, cr, it, grp->head, 0, grp->height, grp->pinned, grp_next_y - listview->scrollpos, -listview->hscrollpos, grp_y + listview->grouptitle_height - listview->scrollpos, listview->totalwidth, grp_height_total);
+ // draw pinned group title
+ if (grp->pinned == 1 && gtkui_groups_pinned && y <= 0) {
+ ddb_listview_list_render_row_background (listview, cr, NULL, group_idx & 1, 0, -listview->hscrollpos, y, listview->totalwidth, listview->grouptitle_height);
+ if (listview->binding->draw_group_title && listview->grouptitle_height > 0) {
+ listview->binding->draw_group_title (listview, cr, grp->head, -listview->hscrollpos, y - pushback, listview->totalwidth, listview->grouptitle_height);
}
}
+
if (prev) {
listview->binding->unref (prev);
}
if (it) {
listview->binding->unref (it);
}
- grp_y += grpheight;
+ grp_y += grp_height_total;
if (grp->pinned == 1) {
grp = grp->next;
if (grp) {
@@@ -1359,12 -1410,12 +1410,12 @@@ ddb_listview_list_render_row_backgroun
void
ddb_listview_list_render_row_foreground (DdbListview *ps, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int even, int cursor, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int w, int h) {
- int width, height;
- GtkAllocation a;
- gtk_widget_get_allocation (ps->list, &a);
- width = a.width;
- height = a.height;
- if (it && ps->binding->is_selected (it)) {
+ int width, height;
+ GtkAllocation a;
+ gtk_widget_get_allocation (ps->list, &a);
+ width = a.width;
+ height = a.height;
+ if (it && ps->binding->is_selected (it)) {
GdkColor *clr = >k_widget_get_style (theme_treeview)->fg[GTK_STATE_SELECTED];
float rgb[3] = { clr->red/65535.f, clr->green/65535.f, clr->blue/65535.f };
draw_set_fg_color (&ps->listctx, rgb);
@@@ -1378,11 -1429,25 +1429,25 @@@
int cidx = 0;
for (c = ps->columns; c; c = c->next, cidx++) {
int cw = c->width;
- ps->binding->draw_column_data (ps, cr, it, ps->grouptitle_height > 0 ? group_it : NULL, cidx, group_y, group_height, group_pinned, grp_next_y, x, y, cw, h);
+ if (!ddb_listview_is_album_art_column_idx (ps, cidx)) {
+ ps->binding->draw_column_data (ps, cr, it, ps->grouptitle_height > 0 ? group_it : NULL, cidx, group_y, group_height, group_pinned, grp_next_y, x, y, cw, h);
+ }
x += cw;
}
}
+ void
+ ddb_listview_list_render_album_art (DdbListview *ps, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int w, int h) {
+ DdbListviewColumn *c;
+ int cidx = 0;
+ for (c = ps->columns; c; c = c->next, cidx++) {
+ int cw = c->width;
+ if (ddb_listview_is_album_art_column_idx (ps, cidx)) {
+ ps->binding->draw_column_data (ps, cr, it, ps->grouptitle_height > 0 ? group_it : NULL, cidx, group_y, group_height, group_pinned, grp_next_y, x, y, cw, h);
+ }
+ x += cw;
+ }
+ }
void
ddb_listview_header_expose (DdbListview *ps, cairo_t *cr, int x, int y, int w, int h) {
@@@ -1428,7 -1493,11 +1493,11 @@@ ddb_listview_click_selection (DdbListvi
deadbeef->pl_lock ();
ps->areaselect = 0;
ddb_listview_groupcheck (ps);
- if (sel == -1 && (!grp || (ey > ps->grouptitle_height && grp_index >= grp->num_items))) {
+
+ // clicked album art column?
+ int album_art_column = ddb_listview_is_album_art_column (ps, ex);
+
+ if (sel == -1 && !album_art_column && (!grp || (ey > ps->grouptitle_height && grp_index >= grp->num_items))) {
// clicked empty space, deselect everything
DdbListviewIter it;
int idx = 0;
@@@ -1443,7 -1512,7 +1512,7 @@@
it = next;
}
}
- else if ((sel == -1 && grp) || (ey <= ps->grouptitle_height && gtkui_groups_pinned)) {
+ else if ((sel != -1 && grp && grp_index == -1) || (ey <= ps->grouptitle_height && gtkui_groups_pinned) || album_art_column) {
// clicked group title, select group
DdbListviewIter it;
int idx = 0;
@@@ -1555,6 -1624,11 +1624,11 @@@ ddb_listview_list_mouse1_pressed (DdbLi
int prev = cursor;
if (sel != -1) {
+ // pick 1st item in group in case album art column was clicked
+ if (ddb_listview_is_album_art_column (ps, ex) && grp_index != -1) {
+ sel -= grp_index;
+ }
+
ps->binding->set_cursor (sel);
DdbListviewIter it = ps->binding->get_for_idx (sel);
if (it) {
@@@ -1759,7 -1833,7 +1833,7 @@@ ddb_listview_list_mousemove (DdbListvie
deadbeef->pl_lock ();
if (ps->dragwait) {
GtkWidget *widget = ps->list;
- if (gtk_drag_check_threshold (widget, ps->lastpos[0], ex, ps->lastpos[1], ey)) {
+ if (gtk_drag_check_threshold (widget, ps->lastpos[0], ps->lastpos[1], ex, ey)) {
ps->dragwait = 0;
ps->drag_source_playlist = deadbeef->plt_get_curr_idx ();
GtkTargetEntry entry = {
@@@ -2005,20 -2079,6 +2079,6 @@@ ddb_listview_handle_keypress (DdbListvi
cursor = 0;
gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_lower (adj));
}
- else if (keyval == GDK_Menu) {
- DdbListviewIter it = ps->binding->head ();
- while (it && !ps->binding->is_selected (it)) {
- DdbListviewIter next = ps->binding->next (it);
- ps->binding->unref (it);
- it = next;
- }
- if (it) {
- int sel = ps->binding->get_idx (it);
- ps->binding->list_context_menu (ps, it, sel);
- ps->binding->unref (it);
- }
- return TRUE;
- }
else {
return FALSE;
}
@@@ -2086,6 -2146,23 +2146,23 @@@
return TRUE;
}
+ gboolean
+ ddb_listview_list_popup_menu (GtkWidget *widget, gpointer user_data) {
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ DdbListviewIter it = ps->binding->head ();
+ while (it && !ps->binding->is_selected (it)) {
+ DdbListviewIter next = ps->binding->next (it);
+ ps->binding->unref (it);
+ it = next;
+ }
+ if (it) {
+ int sel = ps->binding->get_idx (it);
+ ps->binding->list_context_menu (ps, it, sel);
+ ps->binding->unref (it);
+ }
+ return TRUE;
+ }
+
int
ddb_listview_dragdrop_get_row_from_coord (DdbListview *listview, int y) {
if (y == -1) {
@@@ -2393,32 -2470,18 +2470,18 @@@ ddb_listview_header_configure_even
gtk_widget_get_allocation (GTK_WIDGET (ps), &lva);
int totalwidth = lva.width;
+ // col_autoresize flag indicates whether fwidth is valid
if (!ps->lock_columns) {
DdbListviewColumn *c;
- if (ps->header_width != totalwidth && deadbeef->conf_get_int ("gtkui.autoresize_columns", 0)) {
- if (!ps->col_autoresize) {
- for (c = ps->columns; c; c = c->next) {
- c->fwidth = (float)c->width / (float)totalwidth;
+ if (deadbeef->conf_get_int ("gtkui.autoresize_columns", 0)) {
+ if (ps->header_width != totalwidth) {
+ if (!ps->col_autoresize) {
+ for (c = ps->columns; c; c = c->next) {
+ c->fwidth = (float)c->width / (float)totalwidth;
+ }
+ ps->col_autoresize = 1;
}
- ps->col_autoresize = 1;
- }
- // use the fwidth
- int changed = 0;
- int i = 0;
- for (c = ps->columns; c; c = c->next, i++) {
- int newwidth = totalwidth * c->fwidth;
- if (newwidth != c->width) {
- c->width = newwidth;
- changed = 1;
- ps->binding->column_size_changed (ps, i);
- }
- }
- if (changed) {
- ps->binding->columns_changed (ps);
- }
- }
- else {
- if (ps->col_autoresize) {
+ // use the fwidth
int changed = 0;
int i = 0;
for (c = ps->columns; c; c = c->next, i++) {
@@@ -2429,12 -2492,17 +2492,20 @@@
ps->binding->column_size_changed (ps, i);
}
}
- ps->col_autoresize = 0;
if (changed) {
ps->binding->columns_changed (ps);
}
}
}
++<<<<<<< HEAD
++=======
+ else {
+ for (c = ps->columns; c; c = c->next) {
+ c->fwidth = (float)c->width / (float)totalwidth;
+ }
+ ps->col_autoresize = 1;
+ }
++>>>>>>> upstream/0.6.2
ps->header_width = totalwidth;
}
@@@ -2444,20 -2512,9 +2515,26 @@@
void
ddb_listview_lock_columns (DdbListview *lv, gboolean lock) {
lv->lock_columns = lock;
++<<<<<<< HEAD
+ if (lock == 0) {
+ GtkAllocation a;
+ gtk_widget_get_allocation (GTK_WIDGET (lv), &a);
+ if (deadbeef->conf_get_int ("gtkui.autoresize_columns", 0)) {
+ DdbListviewColumn *c;
+ if (!lv->col_autoresize) {
+ for (c = lv->columns; c; c = c->next) {
+ c->fwidth = (float)c->width / (float)a.width;
+ }
+ lv->col_autoresize = 1;
+ }
+ }
+ lv->header_width = a.width;
+ }
++=======
+
+ // NOTE: at this point, it's still not guaranteed that the allocation contains
+ // the final size, so we don't calc initial autoresize state here
++>>>>>>> upstream/0.6.2
}
@@@ -2550,7 -2607,7 +2627,7 @@@ ddb_listview_header_motion_notify_even
c->fwidth = (float)c->width / ps->header_width;
}
if (c->minheight) {
- ddb_listview_build_groups (ps);
+ ddb_listview_resize_groups (ps);
}
ps->block_redraw_on_scroll = 1;
ddb_listview_list_setup_vscroll (ps);
@@@ -2607,6 -2664,45 +2684,45 @@@ ddb_listview_header_button_press_even
DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
// ps->active_column = ddb_listview_header_get_column_for_coord (ps, event->x);
if (TEST_LEFT_CLICK (event)) {
+
+ ddb_listview_groupcheck (ps);
+ DdbListviewGroup *grp = ps->groups;
+ DdbListviewGroup *grp_next;
+
+ if (grp && ps->scrollpos > 0) {
+ int abs_idx = 0;
+ int grp_y = 0;
+
+ GtkAllocation a;
+ gtk_widget_get_allocation (ps->list, &a);
+ int cursor_pos = ddb_listview_get_row_pos (ps, ps->binding->cursor ());
+ ps->ref_point = 0;
+ ps->ref_point_offset = 0;
+
+ // find 1st group
+ while (grp && grp_y + grp->height < ps->scrollpos) {
+ grp_y += grp->height;
+ abs_idx += grp->num_items;
+ grp = grp->next;
+ }
+ // choose cursor_pos as anchor
+ if (ps->scrollpos < cursor_pos && cursor_pos < ps->scrollpos + a.height && cursor_pos < ps->fullheight) {
+ ps->ref_point = ps->binding->cursor ();
+ ps->ref_point_offset = cursor_pos - ps->scrollpos;
+ }
+ // choose first group as anchor
+ else if (ps->scrollpos < grp_y + ps-> grouptitle_height + (grp->num_items * ps->rowheight) && grp_y + ps-> grouptitle_height + (grp->num_items * ps->rowheight) < ps->scrollpos + a.height) {
+ ps->ref_point = abs_idx;
+ ps->ref_point_offset = (grp_y + ps->grouptitle_height) - ps->scrollpos;
+ }
+ // choose next group as anchor
+ else {
+ grp_y += grp->height;
+ abs_idx += grp->num_items;
+ ps->ref_point = abs_idx;
+ ps->ref_point_offset = (grp_y + ps->grouptitle_height) - ps->scrollpos;
+ }
+ }
// start sizing/dragging
ps->header_dragging = -1;
ps->header_sizing = -1;
@@@ -2688,7 -2784,7 +2804,7 @@@ ddb_listview_header_button_release_even
DdbListviewColumn *c;
for (c = ps->columns; c; c = c->next) {
int w = c->width;
- if (event->x >= x + w - 2 && event->x <= x + w) {
+ if (event->x >= x + w - 4 && event->x <= x + w) {
gdk_window_set_cursor (gtk_widget_get_window (widget), ps->cursor_sz);
break;
}
@@@ -3194,6 -3290,38 +3310,38 @@@ ddb_listview_build_groups (DdbListview
}
void
+ ddb_listview_resize_groups (DdbListview *listview) {
+ deadbeef->pl_lock ();
+ int old_height = listview->fullheight;
+ int grp_height_old = 0;
+ listview->fullheight = 0;
+
+ int min_height= 0;
+ DdbListviewColumn *c;
+ for (c = listview->columns; c; c = c->next) {
+ if (c->minheight && c->width > min_height) {
+ min_height = c->width;
+ }
+ }
+
+ DdbListviewGroup *grp = listview->groups;
+ while (grp) {
+ grp->height = listview->grouptitle_height + grp->num_items * listview->rowheight;
+ if (grp->height - listview->grouptitle_height < min_height) {
+ grp_height_old = grp->height;
+ grp->height = min_height + listview->grouptitle_height;
+ }
+ listview->fullheight += grp->height;
+ grp = grp->next;
+ }
+
+ deadbeef->pl_unlock ();
+ if (old_height != listview->fullheight) {
+ ddb_listview_refresh (listview, DDB_REFRESH_VSCROLL);
+ }
+ }
+
+ void
ddb_listview_set_vscroll (DdbListview *listview, int scroll) {
GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (listview->scrollbar));
gtk_range_set_value (GTK_RANGE (listview->scrollbar), scroll);
@@@ -3216,7 -3344,9 +3364,9 @@@ ddb_listview_clear_sort (DdbListview *l
gboolean
ddb_listview_list_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data) {
DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- return ddb_listview_handle_keypress (listview, event->keyval, event->state);
-
+ if (!ddb_listview_handle_keypress (listview, event->keyval, event->state)) {
+ return on_mainwin_key_press_event (widget, event, user_data);
+ }
+ return TRUE;
}
diff --combined plugins/gtkui/widgets.c
index b8e9481,61db909..50154cf
--- a/plugins/gtkui/widgets.c
+++ b/plugins/gtkui/widgets.c
@@@ -1,5 -1,5 +1,5 @@@
/*
- DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+ DeaDBeeF - The Ultimate Music Player
Copyright (C) 2009-2011 Alexey Yakovenko <waker at users.sourceforge.net>
This program is free software; you can redistribute it and/or
@@@ -37,12 -37,15 +37,18 @@@
#include "namedicons.h"
#include "hotkeys.h" // for building action treeview
#include "../../strdupa.h"
- #include "../../optmath.h"
+ #include "../../fastftoi.h"
#include "actions.h"
+ #include "ddbseekbar.h"
+ #include "ddbvolumebar.h"
+ #include "callbacks.h"
+
+ //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+ #define trace(fmt,...)
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
#define min(x,y) ((x)<(y)?(x):(y))
#define max(x,y) ((x)>(y)?(x):(y))
@@@ -193,6 -196,27 +199,27 @@@ typedef struct
unsigned use_textcolor : 1;
} w_button_t;
+ typedef struct {
+ ddb_gtkui_widget_t base;
+ GtkWidget *seekbar;
+ gint timer;
+ float last_songpos;
+ } w_seekbar_t;
+
+ typedef struct {
+ ddb_gtkui_widget_t base;
+ } w_playtb_t;
+
+ typedef struct {
+ ddb_gtkui_widget_t base;
+ GtkWidget *volumebar;
+ } w_volumebar_t;
+
+ typedef struct {
+ ddb_gtkui_widget_t base;
+ GtkWidget *voices[8];
+ } w_ctvoices_t;
+
static int design_mode;
static ddb_gtkui_widget_t *rootwidget;
@@@ -315,6 -339,145 +342,145 @@@ w_replace (ddb_gtkui_widget_t *w, ddb_g
}
}
+ // unknown widget wrapper
+ typedef struct {
+ ddb_gtkui_widget_t base;
+ GtkWidget *drawarea;
+ char *expected_type;
+ char *parms;
+ char *children;
+ } w_unknown_t;
+
+ const char *
+ w_unknown_load (struct ddb_gtkui_widget_s *base, const char *type, const char *s) {
+ w_unknown_t *w = (w_unknown_t *)base;
+ char buffer_parms[4000];
+ char buffer_children[4000];
+
+ const char *p = s;
+ while (*p && *p != '{') {
+ p++;
+ }
+
+ if (!(*p)) {
+ fprintf (stderr, "reached EOL before expected { while trying to load unknown widget %s\n", w->expected_type);
+ return NULL;
+ }
+
+ if (p - s + 1 > sizeof (buffer_parms)) {
+ fprintf (stderr, "buffer to small to load unknown widget %s\n", w->expected_type);
+ return NULL;
+ }
+
+ memcpy (buffer_parms, s, p-s);
+ buffer_parms[p-s] = 0;
+
+ p++;
+ s = p;
+
+ int nb = 1;
+ while (*p) {
+ if (*p == '{') {
+ nb++;
+ }
+ if (*p == '}') {
+ nb--;
+ if (nb == 0) {
+ break;
+ }
+ }
+ p++;
+ }
+ if (!(*p)) {
+ fprintf (stderr, "reached EOL before expected } while trying to load unknown widget %s\n", w->expected_type);
+ return NULL;
+ }
+ if (p - s + 1 > sizeof (buffer_parms)) {
+ fprintf (stderr, "buffer to small to load unknown widget %s\n", w->expected_type);
+ return NULL;
+ }
+ memcpy (buffer_children, s, p-s);
+ buffer_children[p-s] = 0;
+
+ w->parms = strdup (buffer_parms);
+ w->children = strdup (buffer_children);
+
+ // caller expects 's' to point to '}'
+ return p;
+ }
+
+ static void
+ w_unknown_save (struct ddb_gtkui_widget_s *base, char *s, int sz) {
+ w_unknown_t *w = (w_unknown_t *)base;
+ int l = strlen (s);
+ s += l;
+ sz -= l;
+ snprintf (s, sz, "%s%s {%s}", w->expected_type, w->parms, w->children);
+ }
+
+ void w_unknown_destroy (ddb_gtkui_widget_t *_w) {
+ w_unknown_t *w = (w_unknown_t *)_w;
+ if (w->expected_type) {
+ free (w->expected_type);
+ w->expected_type = NULL;
+ }
+ if (w->parms) {
+ free (w->parms);
+ w->parms = NULL;
+ }
+ if (w->children) {
+ free (w->children);
+ w->children = NULL;
+ }
+ }
+
+ static gboolean
+ unknown_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data) {
+ ddb_gtkui_widget_t *w = user_data;
+ cairo_set_source_rgb(cr, 0.1, 0.1, 0.1);
+
+ cairo_set_font_size(cr, 16);
+
+ cairo_move_to(cr, 20, 30);
+
+ char s[1000];
+ snprintf (s, sizeof (s), _("Widget \"%s\" is not available"), ((w_unknown_t *)w)->expected_type);
+
+ cairo_show_text(cr, s);
+ return TRUE;
+ }
+
+ static gboolean
+ unknown_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) {
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
+ gboolean res = unknown_draw (widget, cr, user_data);
+ cairo_destroy (cr);
+ return res;
+ }
+
+ ddb_gtkui_widget_t *
+ w_unknown_create (const char *type) {
+ w_unknown_t *w = malloc (sizeof (w_unknown_t));
+ memset (w, 0, sizeof (w_unknown_t));
+ w->base.type = "unknown";
+ w->base.load = w_unknown_load;
+ w->base.save = w_unknown_save;
+ w->base.destroy = w_unknown_destroy;
+ w->expected_type = strdup (type);
+
+ w->base.widget = gtk_event_box_new ();
+ w->drawarea = gtk_drawing_area_new ();
+ gtk_widget_show (w->drawarea);
+ gtk_container_add (GTK_CONTAINER (w->base.widget), w->drawarea);
+ #if !GTK_CHECK_VERSION(3,0,0)
+ g_signal_connect_after ((gpointer) w->drawarea, "expose_event", G_CALLBACK (unknown_expose_event), w);
+ #else
+ g_signal_connect_after ((gpointer) w->drawarea, "draw", G_CALLBACK (unknown_draw), w);
+ #endif
+ w_override_signals (w->base.widget, w);
+ return (ddb_gtkui_widget_t *)w;
+ }
+
const char *
w_create_from_string (const char *s, ddb_gtkui_widget_t **parent) {
char t[MAX_TOKEN];
@@@ -325,8 -488,7 +491,7 @@@
char *type = strdupa (t);
ddb_gtkui_widget_t *w = w_create (type);
if (!w) {
- fprintf (stderr, "failed to create widget for type %s\n", t);
- return NULL;
+ w = w_unknown_create (type);
}
// nuke all default children
while (w->children) {
@@@ -440,10 -602,17 +605,17 @@@ static char paste_buffer[20000]
void
save_widget_to_string (char *str, int sz, ddb_gtkui_widget_t *w) {
+ // uknown is special case
+ if (!strcmp (w->type, "unknown")) {
+ w->save (w, str, sz);
+ return;
+ }
+
strcat (str, w->type);
if (w->save) {
w->save (w, str, sz);
}
+
strcat (str, " {");
for (ddb_gtkui_widget_t *c = w->children; c; c = c->next) {
save_widget_to_string (str, sz, c);
@@@ -455,7 -624,7 +627,7 @@@ voi
w_save (void) {
char buf[20000] = "";
save_widget_to_string (buf, sizeof (buf), rootwidget->children);
- deadbeef->conf_set_str ("gtkui.layout", buf);
+ deadbeef->conf_set_str (DDB_GTKUI_CONF_LAYOUT, buf);
deadbeef->conf_save ();
}
@@@ -562,12 -731,15 +734,15 @@@ show_widget (GtkWidget *widget, gpointe
gtk_widget_show (widget);
}
+ static GtkRequisition prev_req;
+
void
w_menu_deactivate (GtkMenuShell *menushell, gpointer user_data) {
hidden = 0;
ddb_gtkui_widget_t *w = user_data;
if (GTK_IS_CONTAINER (w->widget)) {
gtk_container_foreach (GTK_CONTAINER (w->widget), show_widget, NULL);
+ gtk_widget_set_size_request (w->widget, prev_req.width, prev_req.height);
}
gtk_widget_set_app_paintable (w->widget, FALSE);
gtk_widget_queue_draw (w->widget);
@@@ -582,9 -754,12 +757,12 @@@ w_button_press_event (GtkWidget *widget
current_widget = user_data;
widget = current_widget->widget;
hidden = 1;
+
if (GTK_IS_CONTAINER (widget)) {
// hide all children
+ gtk_widget_size_request (widget, &prev_req);
gtk_container_foreach (GTK_CONTAINER (widget), hide_widget, NULL);
+ gtk_widget_set_size_request (widget, prev_req.width, prev_req.height);
}
gtk_widget_set_app_paintable (widget, TRUE);
@@@ -857,7 -1032,7 +1035,7 @@@ w_placeholder_create (void)
w->base.widget = gtk_event_box_new ();
w->drawarea = gtk_drawing_area_new ();
- gtk_widget_set_size_request (w->drawarea, 20, 20);
+ gtk_widget_set_size_request (w->base.widget, 20, 20);
gtk_widget_show (w->drawarea);
gtk_container_add (GTK_CONTAINER (w->base.widget), w->drawarea);
@@@ -1603,26 -1778,25 +1781,25 @@@ refresh_cb (gpointer data)
static gboolean
playlistswitch_cb (gpointer p) {
w_playlist_t *tp = (w_playlist_t *)p;
- int curr = deadbeef->plt_get_curr_idx ();
- char conf[100];
- snprintf (conf, sizeof (conf), "playlist.scroll.%d", curr);
- int scroll = deadbeef->conf_get_int (conf, 0);
- snprintf (conf, sizeof (conf), "playlist.cursor.%d", curr);
- int cursor = deadbeef->conf_get_int (conf, -1);
- deadbeef->pl_set_cursor (PL_MAIN, cursor);
if (!strcmp (tp->base.type, "tabbed_playlist")) {
ddb_tabstrip_refresh (((w_tabbed_playlist_t *)tp)->tabstrip);
}
- if (cursor != -1) {
- DB_playItem_t *it = deadbeef->pl_get_for_idx_and_iter (cursor, PL_MAIN);
- if (it) {
- deadbeef->pl_set_selected (it, 1);
- deadbeef->pl_item_unref (it);
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ int cursor = deadbeef->plt_get_cursor (plt, PL_MAIN);
+ int scroll = deadbeef->plt_get_scroll (plt);
+ if (cursor != -1) {
+ DB_playItem_t *it = deadbeef->pl_get_for_idx_and_iter (cursor, PL_MAIN);
+ if (it) {
+ deadbeef->pl_set_selected (it, 1);
+ deadbeef->pl_item_unref (it);
+ }
}
- }
+ deadbeef->plt_unref (plt);
- ddb_listview_refresh (tp->list, DDB_LIST_CHANGED | DDB_REFRESH_LIST | DDB_REFRESH_VSCROLL);
- ddb_listview_set_vscroll (tp->list, scroll);
+ ddb_listview_refresh (tp->list, DDB_LIST_CHANGED | DDB_REFRESH_LIST | DDB_REFRESH_VSCROLL);
+ ddb_listview_set_vscroll (tp->list, scroll);
+ }
return FALSE;
}
@@@ -1649,9 -1823,6 +1826,12 @@@ songchanged_cb (gpointer p)
if (p) {
to_idx = deadbeef->plt_get_item_idx (p, to, PL_MAIN);
if (cursor_follows_playback) {
++<<<<<<< HEAD
+ char conf[100];
+ snprintf (conf, sizeof (conf), "playlist.cursor.%d", plt);
+ deadbeef->conf_set_int (conf, to_idx);
++=======
++>>>>>>> upstream/0.6.2
deadbeef->plt_deselect_all (p);
deadbeef->pl_set_selected (to, 1);
deadbeef->plt_set_cursor (p, PL_MAIN, to_idx);
@@@ -1849,6 -2020,7 +2029,7 @@@ w_playlist_init (ddb_gtkui_widget_t *ba
ddb_listview_show_header (w->list, !w->hideheaders);
g_idle_add (playlistswitch_cb, w);
+ g_idle_add (refresh_cb, w->list);
}
static void
@@@ -1887,11 -2059,11 +2068,11 @@@ w_tabbed_playlist_create (void)
w->tabstrip = DDB_TABSTRIP (tabstrip);
gtk_widget_show (tabstrip);
GtkWidget *list = ddb_listview_new ();
+ gtk_widget_set_size_request (vbox, 100, 100);
w->plt.list = (DdbListview *)list;
gtk_widget_show (list);
gtk_box_pack_start (GTK_BOX (vbox), tabstrip, FALSE, TRUE, 0);
- gtk_widget_set_size_request (tabstrip, -1, 24);
gtk_widget_set_can_focus (tabstrip, FALSE);
gtk_widget_set_can_default (tabstrip, FALSE);
@@@ -1899,7 -2071,6 +2080,6 @@@
main_playlist_init (list);
- // gtk_container_forall (GTK_CONTAINER (w->base.widget), w_override_signals, w);
w_override_signals (w->plt.base.widget, w);
w->plt.base.message = w_tabbed_playlist_message;
@@@ -1915,6 -2086,7 +2095,7 @@@ w_playlist_create (void)
w->base.widget = gtk_event_box_new ();
w->list = DDB_LISTVIEW (ddb_listview_new ());
+ gtk_widget_set_size_request (GTK_WIDGET (w->base.widget), 100, 100);
w->base.save = w_playlist_save;
w->base.load = w_playlist_load;
w->base.init = w_playlist_init;
@@@ -2177,6 -2349,9 +2358,9 @@@ static in
coverart_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
w_coverart_t *ca = (w_coverart_t *)w;
switch (id) {
+ case DB_EV_PLAYLIST_REFRESH:
+ g_idle_add (coverart_redraw_cb, w);
+ break;
case DB_EV_SONGSTARTED:
g_idle_add (coverart_redraw_cb, w);
break;
@@@ -2923,8 -3098,6 +3107,6 @@@ w_hvbox_replace (struct ddb_gtkui_widge
return;
}
- w_remove (container, c);
- w_destroy (c);
if (prev) {
prev->next = newchild;
}
@@@ -2933,6 -3106,8 +3115,8 @@@
}
newchild->next = c->next;
newchild->parent = container;
+ w_remove (container, c);
+ w_destroy (c);
gtk_box_pack_start (GTK_BOX (b->box), newchild->widget, TRUE, TRUE, 0);
gtk_widget_show (newchild->widget);
@@@ -3448,3 -3623,263 +3632,263 @@@ w_button_create (void)
w_override_signals (w->base.widget, w);
return (ddb_gtkui_widget_t *)w;
}
+
+ // seekbar
+ static gboolean
+ redraw_seekbar_cb (gpointer data) {
+ w_seekbar_t *w = data;
+ int iconified = gdk_window_get_state(gtk_widget_get_window(mainwin)) & GDK_WINDOW_STATE_ICONIFIED;
+ if (!gtk_widget_get_visible (mainwin) || iconified) {
+ return FALSE;
+ }
+ gtk_widget_queue_draw (w->seekbar);
+ return FALSE;
+ }
+
+ static gboolean
+ seekbar_frameupdate (gpointer data) {
+ w_seekbar_t *w = data;
+ DB_output_t *output = deadbeef->get_output ();
+ DB_playItem_t *track = deadbeef->streamer_get_playing_track ();
+ DB_fileinfo_t *c = deadbeef->streamer_get_current_fileinfo (); // FIXME: might crash streamer
+ float songpos = w->last_songpos;
+ float duration = track ? deadbeef->pl_get_item_duration (track) : -1;
+ if (!output || (output->state () == OUTPUT_STATE_STOPPED || !track || !c)) {
+ songpos = 0;
+ }
+ else {
+ songpos = deadbeef->streamer_get_playpos ();
+ }
+ // translate pos to seekbar pixels
+ songpos /= duration;
+ GtkAllocation a;
+ gtk_widget_get_allocation (w->seekbar, &a);
+ songpos *= a.width;
+ if (fabs (songpos - w->last_songpos) > 0.01) {
+ gtk_widget_queue_draw (w->seekbar);
+ w->last_songpos = songpos;
+ }
+ if (track) {
+ deadbeef->pl_item_unref (track);
+ }
+ return TRUE;
+ }
+
+ static void
+ w_seekbar_init (ddb_gtkui_widget_t *base) {
+ w_seekbar_t *w = (w_seekbar_t *)base;
+ if (w->timer) {
+ g_source_remove (w->timer);
+ w->timer = 0;
+ }
+
+ w->timer = g_timeout_add (1000/gtkui_get_gui_refresh_rate (), seekbar_frameupdate, w);
+ }
+
+ static int
+ w_seekbar_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+ switch (id) {
+ case DB_EV_SONGCHANGED:
+ g_idle_add (redraw_seekbar_cb, w);
+ break;
+ case DB_EV_CONFIGCHANGED:
+ w_seekbar_init (w);
+ break;
+ }
+ return 0;
+ }
+
+ static void
+ w_seekbar_destroy (ddb_gtkui_widget_t *wbase) {
+ w_seekbar_t *w = (w_seekbar_t *)wbase;
+ if (w->timer) {
+ g_source_remove (w->timer);
+ w->timer = 0;
+ }
+ }
+
+ ddb_gtkui_widget_t *
+ w_seekbar_create (void) {
+ w_seekbar_t *w = malloc (sizeof (w_seekbar_t));
+ memset (w, 0, sizeof (w_seekbar_t));
+ w->base.widget = gtk_event_box_new ();
+ w->base.message = w_seekbar_message;
+ w->base.destroy = w_seekbar_destroy;
+ w->base.init = w_seekbar_init;
+ w->seekbar = ddb_seekbar_new ();
+ gtk_widget_set_size_request (w->base.widget, 20, 16);
+ w->last_songpos = -1;
+ ddb_seekbar_init_signals (DDB_SEEKBAR (w->seekbar), w->base.widget);
+ gtk_widget_show (w->seekbar);
+ gtk_container_add (GTK_CONTAINER (w->base.widget), w->seekbar);
+ w_override_signals (w->base.widget, w);
+ return (ddb_gtkui_widget_t*)w;
+ }
+
+ // play toolbar
+ ddb_gtkui_widget_t *
+ w_playtb_create (void) {
+ w_playtb_t *w = malloc (sizeof (w_playtb_t));
+ memset (w, 0, sizeof (w_playtb_t));
+ w->base.widget = gtk_hbox_new (FALSE, 0);
+ w->base.flags = DDB_GTKUI_WIDGET_FLAG_NON_EXPANDABLE;
+ gtk_widget_show (w->base.widget);
+
+ GtkWidget *stopbtn;
+ GtkWidget *image128;
+ GtkWidget *playbtn;
+ GtkWidget *image2;
+ GtkWidget *pausebtn;
+ GtkWidget *image3;
+ GtkWidget *prevbtn;
+ GtkWidget *image4;
+ GtkWidget *nextbtn;
+ GtkWidget *image5;
+
+
+ stopbtn = gtk_button_new ();
+ gtk_widget_show (stopbtn);
+ gtk_box_pack_start (GTK_BOX (w->base.widget), stopbtn, FALSE, FALSE, 0);
+ gtk_widget_set_can_focus(stopbtn, FALSE);
+ gtk_button_set_relief (GTK_BUTTON (stopbtn), GTK_RELIEF_NONE);
+
+ image128 = gtk_image_new_from_stock ("gtk-media-stop", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image128);
+ gtk_container_add (GTK_CONTAINER (stopbtn), image128);
+
+ playbtn = gtk_button_new ();
+ gtk_widget_show (playbtn);
+ gtk_box_pack_start (GTK_BOX (w->base.widget), playbtn, FALSE, FALSE, 0);
+ gtk_widget_set_can_focus(playbtn, FALSE);
+ gtk_button_set_relief (GTK_BUTTON (playbtn), GTK_RELIEF_NONE);
+
+ image2 = gtk_image_new_from_stock ("gtk-media-play", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image2);
+ gtk_container_add (GTK_CONTAINER (playbtn), image2);
+
+ pausebtn = gtk_button_new ();
+ gtk_widget_show (pausebtn);
+ gtk_box_pack_start (GTK_BOX (w->base.widget), pausebtn, FALSE, FALSE, 0);
+ gtk_widget_set_can_focus(pausebtn, FALSE);
+ gtk_button_set_relief (GTK_BUTTON (pausebtn), GTK_RELIEF_NONE);
+
+ image3 = gtk_image_new_from_stock ("gtk-media-pause", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image3);
+ gtk_container_add (GTK_CONTAINER (pausebtn), image3);
+
+ prevbtn = gtk_button_new ();
+ gtk_widget_show (prevbtn);
+ gtk_box_pack_start (GTK_BOX (w->base.widget), prevbtn, FALSE, FALSE, 0);
+ gtk_widget_set_can_focus(prevbtn, FALSE);
+ gtk_button_set_relief (GTK_BUTTON (prevbtn), GTK_RELIEF_NONE);
+
+ image4 = gtk_image_new_from_stock ("gtk-media-previous", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image4);
+ gtk_container_add (GTK_CONTAINER (prevbtn), image4);
+
+ nextbtn = gtk_button_new ();
+ gtk_widget_show (nextbtn);
+ gtk_box_pack_start (GTK_BOX (w->base.widget), nextbtn, FALSE, FALSE, 0);
+ gtk_widget_set_can_focus(nextbtn, FALSE);
+ gtk_button_set_relief (GTK_BUTTON (nextbtn), GTK_RELIEF_NONE);
+
+ image5 = gtk_image_new_from_stock ("gtk-media-next", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image5);
+ gtk_container_add (GTK_CONTAINER (nextbtn), image5);
+ w_override_signals (w->base.widget, w);
+
+ g_signal_connect ((gpointer) stopbtn, "clicked",
+ G_CALLBACK (on_stopbtn_clicked),
+ NULL);
+ g_signal_connect ((gpointer) playbtn, "clicked",
+ G_CALLBACK (on_playbtn_clicked),
+ NULL);
+ g_signal_connect ((gpointer) pausebtn, "clicked",
+ G_CALLBACK (on_pausebtn_clicked),
+ NULL);
+ g_signal_connect ((gpointer) prevbtn, "clicked",
+ G_CALLBACK (on_prevbtn_clicked),
+ NULL);
+ g_signal_connect ((gpointer) nextbtn, "clicked",
+ G_CALLBACK (on_nextbtn_clicked),
+ NULL);
+ return (ddb_gtkui_widget_t*)w;
+ }
+
+ // volumebar
+ static gboolean
+ redraw_volumebar_cb (gpointer data) {
+ w_volumebar_t *w = data;
+ gtk_widget_queue_draw (w->volumebar);
+ char s[100];
+ int db = deadbeef->volume_get_db ();
+ snprintf (s, sizeof (s), "%s%ddB", db < 0 ? "" : "+", db);
+ gtk_widget_set_tooltip_text (w->volumebar, s);
+ gtk_widget_trigger_tooltip_query (w->volumebar);
+ return FALSE;
+ }
+
+ static int
+ w_volumebar_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+ switch (id) {
+ case DB_EV_CONFIGCHANGED:
+ case DB_EV_VOLUMECHANGED:
+ g_idle_add (redraw_volumebar_cb, w);
+ break;
+ }
+ return 0;
+ }
+
+ ddb_gtkui_widget_t *
+ w_volumebar_create (void) {
+ w_volumebar_t *w = malloc (sizeof (w_volumebar_t));
+ memset (w, 0, sizeof (w_volumebar_t));
+ w->base.widget = gtk_event_box_new ();
+ w->base.message = w_volumebar_message;
+ w->volumebar = ddb_volumebar_new ();
+ ddb_volumebar_init_signals (DDB_VOLUMEBAR (w->volumebar), w->base.widget);
+ gtk_widget_show (w->volumebar);
+ gtk_widget_set_size_request (w->base.widget, 70, -1);
+ gtk_container_add (GTK_CONTAINER (w->base.widget), w->volumebar);
+ w_override_signals (w->base.widget, w);
+ return (ddb_gtkui_widget_t*)w;
+ }
+
+ // chiptune voice ctl
+ static void
+ on_voice_toggled (GtkToggleButton *togglebutton, gpointer user_data) {
+ w_ctvoices_t *w = user_data;
+ int voices = 0;
+ for (int i = 0; i < 8; i++) {
+ int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w->voices[i]));
+ voices |= active << i;
+ }
+ deadbeef->conf_set_int ("chip.voices", voices);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+ }
+
+ ddb_gtkui_widget_t *
+ w_ctvoices_create (void) {
+ w_ctvoices_t *w = malloc (sizeof (w_ctvoices_t));
+ memset (w, 0, sizeof (w_ctvoices_t));
+ w->base.widget = gtk_event_box_new ();
+ GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox);
+ gtk_container_add (GTK_CONTAINER (w->base.widget), hbox);
+
+ GtkWidget *label = gtk_label_new_with_mnemonic (_("Voices:"));
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+ int voices = deadbeef->conf_get_int ("chip.voices", 0xff);
+ for (int i = 0; i < 8; i++) {
+ w->voices[i] = gtk_check_button_new ();
+ gtk_widget_show (w->voices[i]);
+ gtk_box_pack_start (GTK_BOX (hbox), w->voices[i], FALSE, FALSE, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w->voices[i]), voices & (1<<i));
+ g_signal_connect ((gpointer) w->voices[i], "toggled", G_CALLBACK (on_voice_toggled), w);
+ }
+
+ w_override_signals (w->base.widget, w);
+ return (ddb_gtkui_widget_t*)w;
+ }
diff --combined plugins/hotkeys/Makefile.in
index 7a75c66,5f6d741..bd05a76
--- a/plugins/hotkeys/Makefile.in
+++ b/plugins/hotkeys/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/hotkeys
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -118,23 -146,48 +170,48 @@@ am__hotkeys_la_SOURCES_DIST = hotkeys.
@HAVE_HOTKEYS_TRUE@ actionhandlers.lo
am__EXTRA_hotkeys_la_SOURCES_DIST = keysyms.inc
hotkeys_la_OBJECTS = $(am_hotkeys_la_OBJECTS)
- hotkeys_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ hotkeys_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(hotkeys_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_HOTKEYS_TRUE at am_hotkeys_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(hotkeys_la_SOURCES) $(EXTRA_hotkeys_la_SOURCES)
DIST_SOURCES = $(am__hotkeys_la_SOURCES_DIST) \
$(am__EXTRA_hotkeys_la_SOURCES_DIST)
@@@ -143,6 -196,23 +220,26 @@@ am__can_run_installinfo =
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -169,6 -239,7 +266,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -189,10 -260,12 +287,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -215,6 -288,7 +315,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -268,6 -342,7 +369,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -286,6 -361,8 +388,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -311,13 -388,17 +415,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -326,7 -407,9 +434,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -387,10 -470,10 +497,10 @@@ top_srcdir = @top_srcdir
@HAVE_HOTKEYS_TRUE at hotkeysdir = $(libdir)/$(PACKAGE)
@HAVE_HOTKEYS_TRUE at pkglib_LTLIBRARIES = hotkeys.la
@HAVE_HOTKEYS_TRUE at hotkeys_la_SOURCES = hotkeys.c hotkeys.h ../libparser/parser.c ../libparser/parser.h actionhandlers.c actionhandlers.h
- @HAVE_HOTKEYS_TRUE at hotkeys_la_LDFLAGS = -module
+ @HAVE_HOTKEYS_TRUE at hotkeys_la_LDFLAGS = -module -avoid-version
@HAVE_HOTKEYS_TRUE at EXTRA_hotkeys_la_SOURCES = keysyms.inc
@HAVE_HOTKEYS_TRUE at hotkeys_la_LIBADD = $(LDADD) $(HOTKEYS_LIBS)
- @HAVE_HOTKEYS_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
+ @HAVE_HOTKEYS_TRUE at AM_CFLAGS = $(CFLAGS) $(HOTKEYS_CFLAGS) -std=c99
all: all-am
.SUFFIXES:
@@@ -425,6 -508,7 +535,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -451,14 -535,17 +562,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
hotkeys.la: $(hotkeys_la_OBJECTS) $(hotkeys_la_DEPENDENCIES) $(EXTRA_hotkeys_la_DEPENDENCIES)
- $(hotkeys_la_LINK) $(am_hotkeys_la_rpath) $(hotkeys_la_OBJECTS) $(hotkeys_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(hotkeys_la_LINK) $(am_hotkeys_la_rpath) $(hotkeys_la_OBJECTS) $(hotkeys_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -471,32 -558,32 +585,32 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parser.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
parser.lo: ../libparser/parser.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parser.lo -MD -MP -MF $(DEPDIR)/parser.Tpo -c -o parser.lo `test -f '../libparser/parser.c' || echo '$(srcdir)/'`../libparser/parser.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/parser.Tpo $(DEPDIR)/parser.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../libparser/parser.c' object='parser.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parser.lo -MD -MP -MF $(DEPDIR)/parser.Tpo -c -o parser.lo `test -f '../libparser/parser.c' || echo '$(srcdir)/'`../libparser/parser.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/parser.Tpo $(DEPDIR)/parser.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../libparser/parser.c' object='parser.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o parser.lo `test -f '../libparser/parser.c' || echo '$(srcdir)/'`../libparser/parser.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o parser.lo `test -f '../libparser/parser.c' || echo '$(srcdir)/'`../libparser/parser.c
mostlyclean-libtool:
-rm -f *.lo
@@@ -504,26 -591,15 +618,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -535,15 -611,11 +638,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -552,6 -624,21 +651,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -696,19 -783,20 +810,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/lastfm/Makefile.in
index 796f91e,61b6b6e..7faf6e0
--- a/plugins/lastfm/Makefile.in
+++ b/plugins/lastfm/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/lastfm
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -114,23 -142,48 +166,48 @@@ am__DEPENDENCIES_1
am__lastfm_la_SOURCES_DIST = lastfm.c
@HAVE_LASTFM_TRUE at am_lastfm_la_OBJECTS = lastfm.lo
lastfm_la_OBJECTS = $(am_lastfm_la_OBJECTS)
- lastfm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ lastfm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(lastfm_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_LASTFM_TRUE at am_lastfm_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(lastfm_la_SOURCES)
DIST_SOURCES = $(am__lastfm_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -191,23 +215,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -234,7 +261,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -255,12 +282,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -283,7 +310,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -337,7 +364,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -356,8 +383,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -383,17 +410,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -402,9 +429,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,9 -465,9 +492,9 @@@ top_srcdir = @top_srcdir
@HAVE_LASTFM_TRUE at lastfmdir = $(libdir)/$(PACKAGE)
@HAVE_LASTFM_TRUE at pkglib_LTLIBRARIES = lastfm.la
@HAVE_LASTFM_TRUE at lastfm_la_SOURCES = lastfm.c
- @HAVE_LASTFM_TRUE at lastfm_la_LDFLAGS = -module
+ @HAVE_LASTFM_TRUE at lastfm_la_LDFLAGS = -module -avoid-version
@HAVE_LASTFM_TRUE at lastfm_la_LIBADD = $(LDADD) $(CURL_LIBS)
- @HAVE_LASTFM_TRUE at AM_CFLAGS = -std=c99
+ @HAVE_LASTFM_TRUE at AM_CFLAGS = -std=c99 $(CURL_CFLAGS)
all: all-am
.SUFFIXES:
@@@ -419,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
lastfm.la: $(lastfm_la_OBJECTS) $(lastfm_la_DEPENDENCIES) $(EXTRA_lastfm_la_DEPENDENCIES)
- $(lastfm_la_LINK) $(am_lastfm_la_rpath) $(lastfm_la_OBJECTS) $(lastfm_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(lastfm_la_LINK) $(am_lastfm_la_rpath) $(lastfm_la_OBJECTS) $(lastfm_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lastfm.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/libmp4ff/Makefile.in
index 2982070,d58268d..4dc7ff3
--- a/plugins/libmp4ff/Makefile.in
+++ b/plugins/libmp4ff/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,8 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/libmp4ff
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- AUTHORS COPYING
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp AUTHORS COPYING README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -83,26 -110,54 +134,54 @@@ CONFIG_CLEAN_FILES
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
+ AM_V_AR = $(am__v_AR_ at AM_V@)
+ am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
+ am__v_AR_0 = @echo " AR " $@;
+ am__v_AR_1 =
libmp4ff_a_AR = $(AR) $(ARFLAGS)
libmp4ff_a_LIBADD =
- am_libmp4ff_a_OBJECTS = libmp4ff_a-mp4atom.$(OBJEXT) \
- libmp4ff_a-mp4ff.$(OBJEXT) libmp4ff_a-mp4meta.$(OBJEXT) \
- libmp4ff_a-mp4sample.$(OBJEXT) \
- libmp4ff_a-mp4tagupdate.$(OBJEXT) libmp4ff_a-mp4util.$(OBJEXT)
+ am_libmp4ff_a_OBJECTS = mp4atom.$(OBJEXT) mp4ff.$(OBJEXT) \
+ mp4meta.$(OBJEXT) mp4sample.$(OBJEXT) mp4tagupdate.$(OBJEXT) \
+ mp4util.$(OBJEXT)
libmp4ff_a_OBJECTS = $(am_libmp4ff_a_OBJECTS)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(libmp4ff_a_SOURCES)
DIST_SOURCES = $(libmp4ff_a_SOURCES)
am__can_run_installinfo = \
@@@ -110,6 -165,23 +189,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -136,6 -208,7 +235,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -156,10 -229,12 +256,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -182,6 -257,7 +284,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -235,6 -311,7 +338,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -253,6 -330,8 +357,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -278,13 -357,17 +384,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -293,7 -376,9 +403,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -363,7 -448,7 +475,7 @@@ libmp4ff_a_SOURCES =
mp4tagupdate.c\
mp4util.c
- libmp4ff_a_CFLAGS = -fPIC -DUSE_TAGGING
+ AM_CFLAGS = -fPIC -DUSE_TAGGING
all: all-am
.SUFFIXES:
@@@ -401,10 -486,11 +513,11 @@@ $(am__aclocal_m4_deps)
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
libmp4ff.a: $(libmp4ff_a_OBJECTS) $(libmp4ff_a_DEPENDENCIES) $(EXTRA_libmp4ff_a_DEPENDENCIES)
- -rm -f libmp4ff.a
- $(libmp4ff_a_AR) libmp4ff.a $(libmp4ff_a_OBJECTS) $(libmp4ff_a_LIBADD)
- $(RANLIB) libmp4ff.a
+ $(AM_V_at)-rm -f libmp4ff.a
+ $(AM_V_AR)$(libmp4ff_a_AR) libmp4ff.a $(libmp4ff_a_OBJECTS) $(libmp4ff_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libmp4ff.a
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -412,117 -498,33 +525,33 @@@
distclean-compile:
-rm -f *.tab.c
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmp4ff_a-mp4atom.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmp4ff_a-mp4ff.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmp4ff_a-mp4meta.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmp4ff_a-mp4sample.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmp4ff_a-mp4tagupdate.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmp4ff_a-mp4util.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4atom.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4ff.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4meta.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4sample.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4tagupdate.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4util.Po at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- libmp4ff_a-mp4atom.o: mp4atom.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4atom.o -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4atom.Tpo -c -o libmp4ff_a-mp4atom.o `test -f 'mp4atom.c' || echo '$(srcdir)/'`mp4atom.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmp4ff_a-mp4atom.Tpo $(DEPDIR)/libmp4ff_a-mp4atom.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4atom.c' object='libmp4ff_a-mp4atom.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4atom.o `test -f 'mp4atom.c' || echo '$(srcdir)/'`mp4atom.c
-
- libmp4ff_a-mp4atom.obj: mp4atom.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4atom.obj -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4atom.Tpo -c -o libmp4ff_a-mp4atom.obj `if test -f 'mp4atom.c'; then $(CYGPATH_W) 'mp4atom.c'; else $(CYGPATH_W) '$(srcdir)/mp4atom.c'; fi`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmp4ff_a-mp4atom.Tpo $(DEPDIR)/libmp4ff_a-mp4atom.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4atom.c' object='libmp4ff_a-mp4atom.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4atom.obj `if test -f 'mp4atom.c'; then $(CYGPATH_W) 'mp4atom.c'; else $(CYGPATH_W) '$(srcdir)/mp4atom.c'; fi`
-
- libmp4ff_a-mp4ff.o: mp4ff.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4ff.o -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4ff.Tpo -c -o libmp4ff_a-mp4ff.o `test -f 'mp4ff.c' || echo '$(srcdir)/'`mp4ff.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmp4ff_a-mp4ff.Tpo $(DEPDIR)/libmp4ff_a-mp4ff.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4ff.c' object='libmp4ff_a-mp4ff.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4ff.o `test -f 'mp4ff.c' || echo '$(srcdir)/'`mp4ff.c
-
- libmp4ff_a-mp4ff.obj: mp4ff.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4ff.obj -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4ff.Tpo -c -o libmp4ff_a-mp4ff.obj `if test -f 'mp4ff.c'; then $(CYGPATH_W) 'mp4ff.c'; else $(CYGPATH_W) '$(srcdir)/mp4ff.c'; fi`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmp4ff_a-mp4ff.Tpo $(DEPDIR)/libmp4ff_a-mp4ff.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4ff.c' object='libmp4ff_a-mp4ff.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4ff.obj `if test -f 'mp4ff.c'; then $(CYGPATH_W) 'mp4ff.c'; else $(CYGPATH_W) '$(srcdir)/mp4ff.c'; fi`
-
- libmp4ff_a-mp4meta.o: mp4meta.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4meta.o -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4meta.Tpo -c -o libmp4ff_a-mp4meta.o `test -f 'mp4meta.c' || echo '$(srcdir)/'`mp4meta.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmp4ff_a-mp4meta.Tpo $(DEPDIR)/libmp4ff_a-mp4meta.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4meta.c' object='libmp4ff_a-mp4meta.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4meta.o `test -f 'mp4meta.c' || echo '$(srcdir)/'`mp4meta.c
-
- libmp4ff_a-mp4meta.obj: mp4meta.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4meta.obj -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4meta.Tpo -c -o libmp4ff_a-mp4meta.obj `if test -f 'mp4meta.c'; then $(CYGPATH_W) 'mp4meta.c'; else $(CYGPATH_W) '$(srcdir)/mp4meta.c'; fi`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmp4ff_a-mp4meta.Tpo $(DEPDIR)/libmp4ff_a-mp4meta.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4meta.c' object='libmp4ff_a-mp4meta.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4meta.obj `if test -f 'mp4meta.c'; then $(CYGPATH_W) 'mp4meta.c'; else $(CYGPATH_W) '$(srcdir)/mp4meta.c'; fi`
-
- libmp4ff_a-mp4sample.o: mp4sample.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4sample.o -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4sample.Tpo -c -o libmp4ff_a-mp4sample.o `test -f 'mp4sample.c' || echo '$(srcdir)/'`mp4sample.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmp4ff_a-mp4sample.Tpo $(DEPDIR)/libmp4ff_a-mp4sample.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4sample.c' object='libmp4ff_a-mp4sample.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4sample.o `test -f 'mp4sample.c' || echo '$(srcdir)/'`mp4sample.c
-
- libmp4ff_a-mp4sample.obj: mp4sample.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4sample.obj -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4sample.Tpo -c -o libmp4ff_a-mp4sample.obj `if test -f 'mp4sample.c'; then $(CYGPATH_W) 'mp4sample.c'; else $(CYGPATH_W) '$(srcdir)/mp4sample.c'; fi`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmp4ff_a-mp4sample.Tpo $(DEPDIR)/libmp4ff_a-mp4sample.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4sample.c' object='libmp4ff_a-mp4sample.obj' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4sample.obj `if test -f 'mp4sample.c'; then $(CYGPATH_W) 'mp4sample.c'; else $(CYGPATH_W) '$(srcdir)/mp4sample.c'; fi`
-
- libmp4ff_a-mp4tagupdate.o: mp4tagupdate.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4tagupdate.o -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4tagupdate.Tpo -c -o libmp4ff_a-mp4tagupdate.o `test -f 'mp4tagupdate.c' || echo '$(srcdir)/'`mp4tagupdate.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmp4ff_a-mp4tagupdate.Tpo $(DEPDIR)/libmp4ff_a-mp4tagupdate.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4tagupdate.c' object='libmp4ff_a-mp4tagupdate.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4tagupdate.o `test -f 'mp4tagupdate.c' || echo '$(srcdir)/'`mp4tagupdate.c
-
- libmp4ff_a-mp4tagupdate.obj: mp4tagupdate.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4tagupdate.obj -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4tagupdate.Tpo -c -o libmp4ff_a-mp4tagupdate.obj `if test -f 'mp4tagupdate.c'; then $(CYGPATH_W) 'mp4tagupdate.c'; else $(CYGPATH_W) '$(srcdir)/mp4tagupdate.c'; fi`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmp4ff_a-mp4tagupdate.Tpo $(DEPDIR)/libmp4ff_a-mp4tagupdate.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4tagupdate.c' object='libmp4ff_a-mp4tagupdate.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4tagupdate.obj `if test -f 'mp4tagupdate.c'; then $(CYGPATH_W) 'mp4tagupdate.c'; else $(CYGPATH_W) '$(srcdir)/mp4tagupdate.c'; fi`
-
- libmp4ff_a-mp4util.o: mp4util.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4util.o -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4util.Tpo -c -o libmp4ff_a-mp4util.o `test -f 'mp4util.c' || echo '$(srcdir)/'`mp4util.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmp4ff_a-mp4util.Tpo $(DEPDIR)/libmp4ff_a-mp4util.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4util.c' object='libmp4ff_a-mp4util.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4util.o `test -f 'mp4util.c' || echo '$(srcdir)/'`mp4util.c
-
- libmp4ff_a-mp4util.obj: mp4util.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -MT libmp4ff_a-mp4util.obj -MD -MP -MF $(DEPDIR)/libmp4ff_a-mp4util.Tpo -c -o libmp4ff_a-mp4util.obj `if test -f 'mp4util.c'; then $(CYGPATH_W) 'mp4util.c'; else $(CYGPATH_W) '$(srcdir)/mp4util.c'; fi`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmp4ff_a-mp4util.Tpo $(DEPDIR)/libmp4ff_a-mp4util.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4util.c' object='libmp4ff_a-mp4util.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4ff_a_CFLAGS) $(CFLAGS) -c -o libmp4ff_a-mp4util.obj `if test -f 'mp4util.c'; then $(CYGPATH_W) 'mp4util.c'; else $(CYGPATH_W) '$(srcdir)/mp4util.c'; fi`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -530,26 -532,15 +559,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -561,15 -552,11 +579,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -578,6 -565,21 +592,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -719,18 -721,19 +748,19 @@@ uninstall-am
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/libparser/Makefile.in
index def7076,c2e3336..1c3b13f
--- a/plugins/libparser/Makefile.in
+++ b/plugins/libparser/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/libparser
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -82,23 -110,52 +134,52 @@@ CONFIG_CLEAN_FILES
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
+ AM_V_AR = $(am__v_AR_ at AM_V@)
+ am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
+ am__v_AR_0 = @echo " AR " $@;
+ am__v_AR_1 =
libparser_a_AR = $(AR) $(ARFLAGS)
libparser_a_LIBADD =
- am_libparser_a_OBJECTS = libparser_a-parser.$(OBJEXT)
+ am_libparser_a_OBJECTS = parser.$(OBJEXT)
libparser_a_OBJECTS = $(am_libparser_a_OBJECTS)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(libparser_a_SOURCES)
DIST_SOURCES = $(libparser_a_SOURCES)
am__can_run_installinfo = \
@@@ -106,6 -163,23 +187,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -132,6 -206,7 +233,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -152,10 -227,12 +254,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -178,6 -255,7 +282,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -231,6 -309,7 +336,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -249,6 -328,8 +355,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -274,13 -355,17 +382,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -289,7 -374,9 +401,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -349,7 -436,7 +463,7 @@@ top_builddir = @top_builddir
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libparser.a
libparser_a_SOURCES = parser.c parser.h
- libparser_a_CFLAGS = -fPIC
+ AM_CFLAGS = -fPIC
all: all-am
.SUFFIXES:
@@@ -387,10 -474,11 +501,11 @@@ $(am__aclocal_m4_deps)
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
libparser.a: $(libparser_a_OBJECTS) $(libparser_a_DEPENDENCIES) $(EXTRA_libparser_a_DEPENDENCIES)
- -rm -f libparser.a
- $(libparser_a_AR) libparser.a $(libparser_a_OBJECTS) $(libparser_a_LIBADD)
- $(RANLIB) libparser.a
+ $(AM_V_at)-rm -f libparser.a
+ $(AM_V_AR)$(libparser_a_AR) libparser.a $(libparser_a_OBJECTS) $(libparser_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libparser.a
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -398,42 -486,28 +513,28 @@@
distclean-compile:
-rm -f *.tab.c
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libparser_a-parser.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parser.Po at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- libparser_a-parser.o: parser.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libparser_a_CFLAGS) $(CFLAGS) -MT libparser_a-parser.o -MD -MP -MF $(DEPDIR)/libparser_a-parser.Tpo -c -o libparser_a-parser.o `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libparser_a-parser.Tpo $(DEPDIR)/libparser_a-parser.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='parser.c' object='libparser_a-parser.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libparser_a_CFLAGS) $(CFLAGS) -c -o libparser_a-parser.o `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
-
- libparser_a-parser.obj: parser.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libparser_a_CFLAGS) $(CFLAGS) -MT libparser_a-parser.obj -MD -MP -MF $(DEPDIR)/libparser_a-parser.Tpo -c -o libparser_a-parser.obj `if test -f 'parser.c'; then $(CYGPATH_W) 'parser.c'; else $(CYGPATH_W) '$(srcdir)/parser.c'; fi`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libparser_a-parser.Tpo $(DEPDIR)/libparser_a-parser.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='parser.c' object='libparser_a-parser.obj' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libparser_a_CFLAGS) $(CFLAGS) -c -o libparser_a-parser.obj `if test -f 'parser.c'; then $(CYGPATH_W) 'parser.c'; else $(CYGPATH_W) '$(srcdir)/parser.c'; fi`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -441,26 -515,15 +542,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -472,15 -535,11 +562,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -489,6 -548,21 +575,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -630,18 -704,19 +731,19 @@@ uninstall-am
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/m3u/Makefile.in
index 2c3383d,9ce647e..c65a976
--- a/plugins/m3u/Makefile.in
+++ b/plugins/m3u/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/m3u
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -113,23 -141,48 +165,48 @@@ m3u_la_DEPENDENCIES
am__m3u_la_SOURCES_DIST = m3u.c
@HAVE_M3U_TRUE at am_m3u_la_OBJECTS = m3u_la-m3u.lo
m3u_la_OBJECTS = $(am_m3u_la_OBJECTS)
- m3u_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(m3u_la_CFLAGS) $(CFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ m3u_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(m3u_la_CFLAGS) $(CFLAGS) \
$(m3u_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_M3U_TRUE at am_m3u_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(m3u_la_SOURCES)
DIST_SOURCES = $(am__m3u_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -137,6 -190,23 +214,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -163,6 -233,7 +260,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -183,10 -254,12 +281,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -209,6 -282,7 +309,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -262,6 -336,7 +363,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -280,6 -355,8 +382,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -305,13 -382,17 +409,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -320,7 -401,9 +428,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -380,7 -463,7 +490,7 @@@ top_builddir = @top_builddir
top_srcdir = @top_srcdir@
@HAVE_M3U_TRUE at pkglib_LTLIBRARIES = m3u.la
@HAVE_M3U_TRUE at m3u_la_SOURCES = m3u.c
- @HAVE_M3U_TRUE at m3u_la_LDFLAGS = -module -lm
+ @HAVE_M3U_TRUE at m3u_la_LDFLAGS = -module -avoid-version -lm
@HAVE_M3U_TRUE at m3u_la_LIBADD = $(LIBADD)
@HAVE_M3U_TRUE at m3u_la_CFLAGS = $(CFLAGS) -std=c99
all: all-am
@@@ -417,6 -500,7 +527,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -443,14 -527,17 +554,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
m3u.la: $(m3u_la_OBJECTS) $(m3u_la_DEPENDENCIES) $(EXTRA_m3u_la_DEPENDENCIES)
- $(m3u_la_LINK) $(am_m3u_la_rpath) $(m3u_la_OBJECTS) $(m3u_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(m3u_la_LINK) $(am_m3u_la_rpath) $(m3u_la_OBJECTS) $(m3u_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -461,32 -548,32 +575,32 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/m3u_la-m3u.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
m3u_la-m3u.lo: m3u.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m3u_la_CFLAGS) $(CFLAGS) -MT m3u_la-m3u.lo -MD -MP -MF $(DEPDIR)/m3u_la-m3u.Tpo -c -o m3u_la-m3u.lo `test -f 'm3u.c' || echo '$(srcdir)/'`m3u.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/m3u_la-m3u.Tpo $(DEPDIR)/m3u_la-m3u.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='m3u.c' object='m3u_la-m3u.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m3u_la_CFLAGS) $(CFLAGS) -MT m3u_la-m3u.lo -MD -MP -MF $(DEPDIR)/m3u_la-m3u.Tpo -c -o m3u_la-m3u.lo `test -f 'm3u.c' || echo '$(srcdir)/'`m3u.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/m3u_la-m3u.Tpo $(DEPDIR)/m3u_la-m3u.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='m3u.c' object='m3u_la-m3u.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m3u_la_CFLAGS) $(CFLAGS) -c -o m3u_la-m3u.lo `test -f 'm3u.c' || echo '$(srcdir)/'`m3u.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m3u_la_CFLAGS) $(CFLAGS) -c -o m3u_la-m3u.lo `test -f 'm3u.c' || echo '$(srcdir)/'`m3u.c
mostlyclean-libtool:
-rm -f *.lo
@@@ -494,26 -581,15 +608,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -525,15 -601,11 +628,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -542,6 -614,21 +641,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -686,19 -773,20 +800,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/mms/Makefile.in
index 087b760,51251aa..c0b98d6
--- a/plugins/mms/Makefile.in
+++ b/plugins/mms/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/mms
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -118,23 -146,48 +170,48 @@@ am__mms_la_SOURCES_DIST = mmsplug.c lib
@HAVE_MMS_TRUE at am_mms_la_OBJECTS = mmsplug.lo mms.lo mmsh.lo mmsx.lo \
@HAVE_MMS_TRUE@ uri.lo
mms_la_OBJECTS = $(am_mms_la_OBJECTS)
- mms_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(mms_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ mms_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(mms_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_MMS_TRUE at am_mms_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(mms_la_SOURCES)
DIST_SOURCES = $(am__mms_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -142,6 -195,23 +219,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -168,6 -238,7 +265,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -188,10 -259,12 +286,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -214,6 -287,7 +314,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -267,6 -341,7 +368,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -285,6 -360,8 +387,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -310,13 -387,17 +414,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -325,7 -406,9 +433,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -399,7 -482,7 +509,7 @@@ top_srcdir = @top_srcdir
@HAVE_MMS_TRUE@ libmms/mmsx.h\
@HAVE_MMS_TRUE@ libmms/uri.h
- @HAVE_MMS_TRUE at mms_la_LDFLAGS = -module
+ @HAVE_MMS_TRUE at mms_la_LDFLAGS = -module -avoid-version
@HAVE_MMS_TRUE at mms_la_LIBADD = $(LDADD) $(LIBMMS_LIBS)
@HAVE_MMS_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
all: all-am
@@@ -436,6 -519,7 +546,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -462,14 -546,17 +573,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
mms.la: $(mms_la_OBJECTS) $(mms_la_DEPENDENCIES) $(EXTRA_mms_la_DEPENDENCIES)
- $(mms_la_LINK) $(am_mms_la_rpath) $(mms_la_OBJECTS) $(mms_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(mms_la_LINK) $(am_mms_la_rpath) $(mms_la_OBJECTS) $(mms_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -484,53 -571,53 +598,53 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uri.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mms.lo: libmms/mms.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mms.lo -MD -MP -MF $(DEPDIR)/mms.Tpo -c -o mms.lo `test -f 'libmms/mms.c' || echo '$(srcdir)/'`libmms/mms.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mms.Tpo $(DEPDIR)/mms.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libmms/mms.c' object='mms.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mms.lo -MD -MP -MF $(DEPDIR)/mms.Tpo -c -o mms.lo `test -f 'libmms/mms.c' || echo '$(srcdir)/'`libmms/mms.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mms.Tpo $(DEPDIR)/mms.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmms/mms.c' object='mms.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mms.lo `test -f 'libmms/mms.c' || echo '$(srcdir)/'`libmms/mms.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mms.lo `test -f 'libmms/mms.c' || echo '$(srcdir)/'`libmms/mms.c
mmsh.lo: libmms/mmsh.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmsh.lo -MD -MP -MF $(DEPDIR)/mmsh.Tpo -c -o mmsh.lo `test -f 'libmms/mmsh.c' || echo '$(srcdir)/'`libmms/mmsh.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mmsh.Tpo $(DEPDIR)/mmsh.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libmms/mmsh.c' object='mmsh.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmsh.lo -MD -MP -MF $(DEPDIR)/mmsh.Tpo -c -o mmsh.lo `test -f 'libmms/mmsh.c' || echo '$(srcdir)/'`libmms/mmsh.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mmsh.Tpo $(DEPDIR)/mmsh.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmms/mmsh.c' object='mmsh.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmsh.lo `test -f 'libmms/mmsh.c' || echo '$(srcdir)/'`libmms/mmsh.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmsh.lo `test -f 'libmms/mmsh.c' || echo '$(srcdir)/'`libmms/mmsh.c
mmsx.lo: libmms/mmsx.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmsx.lo -MD -MP -MF $(DEPDIR)/mmsx.Tpo -c -o mmsx.lo `test -f 'libmms/mmsx.c' || echo '$(srcdir)/'`libmms/mmsx.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mmsx.Tpo $(DEPDIR)/mmsx.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libmms/mmsx.c' object='mmsx.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmsx.lo -MD -MP -MF $(DEPDIR)/mmsx.Tpo -c -o mmsx.lo `test -f 'libmms/mmsx.c' || echo '$(srcdir)/'`libmms/mmsx.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mmsx.Tpo $(DEPDIR)/mmsx.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmms/mmsx.c' object='mmsx.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmsx.lo `test -f 'libmms/mmsx.c' || echo '$(srcdir)/'`libmms/mmsx.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmsx.lo `test -f 'libmms/mmsx.c' || echo '$(srcdir)/'`libmms/mmsx.c
uri.lo: libmms/uri.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uri.lo -MD -MP -MF $(DEPDIR)/uri.Tpo -c -o uri.lo `test -f 'libmms/uri.c' || echo '$(srcdir)/'`libmms/uri.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uri.Tpo $(DEPDIR)/uri.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libmms/uri.c' object='uri.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uri.lo -MD -MP -MF $(DEPDIR)/uri.Tpo -c -o uri.lo `test -f 'libmms/uri.c' || echo '$(srcdir)/'`libmms/uri.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uri.Tpo $(DEPDIR)/uri.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmms/uri.c' object='uri.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uri.lo `test -f 'libmms/uri.c' || echo '$(srcdir)/'`libmms/uri.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uri.lo `test -f 'libmms/uri.c' || echo '$(srcdir)/'`libmms/uri.c
mostlyclean-libtool:
-rm -f *.lo
@@@ -538,26 -625,15 +652,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -569,15 -645,11 +672,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -586,6 -658,21 +685,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -730,19 -817,20 +844,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/mono2stereo/Makefile.in
index 3caf966,d8aad8e..49cf306
--- a/plugins/mono2stereo/Makefile.in
+++ b/plugins/mono2stereo/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/mono2stereo
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -113,24 -141,50 +165,50 @@@ ddb_mono2stereo_la_DEPENDENCIES
am__ddb_mono2stereo_la_SOURCES_DIST = mono2stereo.c
@HAVE_MONO2STEREO_TRUE at am_ddb_mono2stereo_la_OBJECTS = mono2stereo.lo
ddb_mono2stereo_la_OBJECTS = $(am_ddb_mono2stereo_la_OBJECTS)
- ddb_mono2stereo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(ddb_mono2stereo_la_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ ddb_mono2stereo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(ddb_mono2stereo_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
@HAVE_MONO2STEREO_TRUE at am_ddb_mono2stereo_la_rpath = -rpath \
@HAVE_MONO2STEREO_TRUE@ $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(ddb_mono2stereo_la_SOURCES)
DIST_SOURCES = $(am__ddb_mono2stereo_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -192,23 +216,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -235,7 +262,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -256,12 +283,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -284,7 +311,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -338,7 +365,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -357,8 +384,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -384,17 +411,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -403,9 +430,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -381,7 -465,7 +492,7 @@@ top_builddir = @top_builddir
top_srcdir = @top_srcdir@
@HAVE_MONO2STEREO_TRUE at pkglib_LTLIBRARIES = ddb_mono2stereo.la
@HAVE_MONO2STEREO_TRUE at ddb_mono2stereo_la_SOURCES = mono2stereo.c
- @HAVE_MONO2STEREO_TRUE at ddb_mono2stereo_la_LDFLAGS = -module
+ @HAVE_MONO2STEREO_TRUE at ddb_mono2stereo_la_LDFLAGS = -module -avoid-version
@HAVE_MONO2STEREO_TRUE at ddb_mono2stereo_la_LIBADD = $(LDADD)
@HAVE_MONO2STEREO_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
all: all-am
@@@ -418,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -444,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
ddb_mono2stereo.la: $(ddb_mono2stereo_la_OBJECTS) $(ddb_mono2stereo_la_DEPENDENCIES) $(EXTRA_ddb_mono2stereo_la_DEPENDENCIES)
- $(ddb_mono2stereo_la_LINK) $(am_ddb_mono2stereo_la_rpath) $(ddb_mono2stereo_la_OBJECTS) $(ddb_mono2stereo_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(ddb_mono2stereo_la_LINK) $(am_ddb_mono2stereo_la_rpath) $(ddb_mono2stereo_la_OBJECTS) $(ddb_mono2stereo_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -462,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mono2stereo.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -488,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -519,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -536,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -680,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/mpgmad/Makefile.in
index 1971d66,ab5ae73..57d9bf4
--- a/plugins/mpgmad/Makefile.in
+++ b/plugins/mpgmad/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/mpgmad
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -114,23 -142,48 +166,48 @@@ am__DEPENDENCIES_1
am__mpgmad_la_SOURCES_DIST = mpgmad.c
@HAVE_MPGMAD_TRUE at am_mpgmad_la_OBJECTS = mpgmad.lo
mpgmad_la_OBJECTS = $(am_mpgmad_la_OBJECTS)
- mpgmad_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ mpgmad_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(mpgmad_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_MPGMAD_TRUE at am_mpgmad_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(mpgmad_la_SOURCES)
DIST_SOURCES = $(am__mpgmad_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -191,23 +215,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -234,7 +261,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -255,12 +282,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -283,7 +310,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -337,7 +364,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -356,8 +383,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -383,17 +410,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -402,9 +429,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,9 -465,9 +492,9 @@@ top_srcdir = @top_srcdir
@HAVE_MPGMAD_TRUE at mpgmaddir = $(libdir)/$(PACKAGE)
@HAVE_MPGMAD_TRUE at pkglib_LTLIBRARIES = mpgmad.la
@HAVE_MPGMAD_TRUE at mpgmad_la_SOURCES = mpgmad.c
- @HAVE_MPGMAD_TRUE at mpgmad_la_LDFLAGS = -module
+ @HAVE_MPGMAD_TRUE at mpgmad_la_LDFLAGS = -module -avoid-version
@HAVE_MPGMAD_TRUE at mpgmad_la_LIBADD = $(LDADD) $(MAD_LIBS)
- @HAVE_MPGMAD_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
+ @HAVE_MPGMAD_TRUE at AM_CFLAGS = $(CFLAGS) $(MAD_CFLAGS) -std=c99 -fPIC
all: all-am
.SUFFIXES:
@@@ -419,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
mpgmad.la: $(mpgmad_la_OBJECTS) $(mpgmad_la_DEPENDENCIES) $(EXTRA_mpgmad_la_DEPENDENCIES)
- $(mpgmad_la_LINK) $(am_mpgmad_la_rpath) $(mpgmad_la_OBJECTS) $(mpgmad_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(mpgmad_la_LINK) $(am_mpgmad_la_rpath) $(mpgmad_la_OBJECTS) $(mpgmad_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mpgmad.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/musepack/Makefile.in
index aae07e5,57de3db..45fd6ce
--- a/plugins/musepack/Makefile.in
+++ b/plugins/musepack/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/musepack
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -120,23 -148,48 +172,48 @@@ am__musepack_la_SOURCES_DIST = musepack
@HAVE_MUSEPACK_TRUE@ mpc_demux.lo mpc_reader.lo requant.lo \
@HAVE_MUSEPACK_TRUE@ streaminfo.lo synth_filter.lo crc32.lo
musepack_la_OBJECTS = $(am_musepack_la_OBJECTS)
- musepack_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ musepack_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(musepack_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_MUSEPACK_TRUE at am_musepack_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(musepack_la_SOURCES)
DIST_SOURCES = $(am__musepack_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -144,6 -197,23 +221,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -170,6 -240,7 +267,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -190,10 -261,12 +288,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -216,6 -289,7 +316,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -269,6 -343,7 +370,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -287,6 -362,8 +389,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -312,13 -389,17 +416,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -327,7 -408,9 +435,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -408,7 -491,7 +518,7 @@@ top_srcdir = @top_srcdir
@HAVE_MUSEPACK_TRUE at mpc/mpc_types.h\
@HAVE_MUSEPACK_TRUE at mpc/minimax.h
- @HAVE_MUSEPACK_TRUE at musepack_la_LDFLAGS = -module
+ @HAVE_MUSEPACK_TRUE at musepack_la_LDFLAGS = -module -avoid-version
@HAVE_MUSEPACK_TRUE at musepack_la_LIBADD = $(LDADD) -lm
@HAVE_MUSEPACK_TRUE at AM_CFLAGS = $(CFLAGS) -fPIC -std=c99
all: all-am
@@@ -445,6 -528,7 +555,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -471,14 -555,17 +582,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
musepack.la: $(musepack_la_OBJECTS) $(musepack_la_DEPENDENCIES) $(EXTRA_musepack_la_DEPENDENCIES)
- $(musepack_la_LINK) $(am_musepack_la_rpath) $(musepack_la_OBJECTS) $(musepack_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(musepack_la_LINK) $(am_musepack_la_rpath) $(musepack_la_OBJECTS) $(musepack_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -498,25 -585,25 +612,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/synth_filter.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -524,26 -611,15 +638,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -555,15 -631,11 +658,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -572,6 -644,21 +671,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -716,19 -803,20 +830,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/notify/Makefile.in
index d032880,cd98d93..f3af4a7
--- a/plugins/notify/Makefile.in
+++ b/plugins/notify/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/notify
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -114,23 -142,48 +166,48 @@@ am__DEPENDENCIES_1
am__notify_la_SOURCES_DIST = notify.c
@HAVE_NOTIFY_TRUE at am_notify_la_OBJECTS = notify.lo
notify_la_OBJECTS = $(am_notify_la_OBJECTS)
- notify_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ notify_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(notify_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_NOTIFY_TRUE at am_notify_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(notify_la_SOURCES)
DIST_SOURCES = $(am__notify_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -191,23 +215,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -234,7 +261,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -255,12 +282,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -283,7 +310,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -337,7 +364,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -356,8 +383,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -383,17 +410,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -402,9 +429,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,7 -465,7 +492,7 @@@ top_srcdir = @top_srcdir
@HAVE_NOTIFY_TRUE at notifydir = $(libdir)/$(PACKAGE)
@HAVE_NOTIFY_TRUE at pkglib_LTLIBRARIES = notify.la
@HAVE_NOTIFY_TRUE at notify_la_SOURCES = notify.c
- @HAVE_NOTIFY_TRUE at notify_la_LDFLAGS = -module
+ @HAVE_NOTIFY_TRUE at notify_la_LDFLAGS = -module -avoid-version
@HAVE_NOTIFY_TRUE at notify_la_LIBADD = $(LDADD) $(NOTIFY_LIBS)
@HAVE_NOTIFY_TRUE at AM_CFLAGS = $(CFLAGS) $(NOTIFY_CFLAGS) -std=c99
all: all-am
@@@ -419,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
notify.la: $(notify_la_OBJECTS) $(notify_la_DEPENDENCIES) $(EXTRA_notify_la_DEPENDENCIES)
- $(notify_la_LINK) $(am_notify_la_rpath) $(notify_la_OBJECTS) $(notify_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(notify_la_LINK) $(am_notify_la_rpath) $(notify_la_OBJECTS) $(notify_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/notify.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/nullout/Makefile.in
index 4fc42bc,d65ac3b..2f21050
--- a/plugins/nullout/Makefile.in
+++ b/plugins/nullout/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/nullout
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -113,23 -141,48 +165,48 @@@ nullout_la_LIBADD
am__nullout_la_SOURCES_DIST = nullout.c
@HAVE_NULLOUT_TRUE at am_nullout_la_OBJECTS = nullout.lo
nullout_la_OBJECTS = $(am_nullout_la_OBJECTS)
- nullout_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ nullout_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(nullout_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_NULLOUT_TRUE at am_nullout_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(nullout_la_SOURCES)
DIST_SOURCES = $(am__nullout_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -137,6 -190,23 +214,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -163,6 -233,7 +260,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -183,10 -254,12 +281,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -209,6 -282,7 +309,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -262,6 -336,7 +363,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -280,6 -355,8 +382,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -305,13 -382,17 +409,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -320,7 -401,9 +428,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -381,7 -464,7 +491,7 @@@ top_srcdir = @top_srcdir
@HAVE_NULLOUT_TRUE at nulloutdir = $(libdir)/$(PACKAGE)
@HAVE_NULLOUT_TRUE at pkglib_LTLIBRARIES = nullout.la
@HAVE_NULLOUT_TRUE at nullout_la_SOURCES = nullout.c
- @HAVE_NULLOUT_TRUE at nullout_la_LDFLAGS = -module
+ @HAVE_NULLOUT_TRUE at nullout_la_LDFLAGS = -module -avoid-version
@HAVE_NULLOUT_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
all: all-am
@@@ -417,6 -500,7 +527,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -443,14 -527,17 +554,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
nullout.la: $(nullout_la_OBJECTS) $(nullout_la_DEPENDENCIES) $(EXTRA_nullout_la_DEPENDENCIES)
- $(nullout_la_LINK) $(am_nullout_la_rpath) $(nullout_la_OBJECTS) $(nullout_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(nullout_la_LINK) $(am_nullout_la_rpath) $(nullout_la_OBJECTS) $(nullout_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -461,25 -548,25 +575,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nullout.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -487,26 -574,15 +601,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -518,15 -594,11 +621,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -535,6 -607,21 +634,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -679,19 -766,20 +793,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/oss/Makefile.in
index d624237,7fff2ce..dc2982a
--- a/plugins/oss/Makefile.in
+++ b/plugins/oss/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/oss
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -113,23 -141,48 +165,48 @@@ oss_la_LIBADD
am__oss_la_SOURCES_DIST = oss.c
@HAVE_OSS_TRUE at am_oss_la_OBJECTS = oss.lo
oss_la_OBJECTS = $(am_oss_la_OBJECTS)
- oss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(oss_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ oss_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(oss_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_OSS_TRUE at am_oss_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(oss_la_SOURCES)
DIST_SOURCES = $(am__oss_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -137,6 -190,23 +214,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -163,6 -233,7 +260,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -183,10 -254,12 +281,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -209,6 -282,7 +309,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -262,6 -336,7 +363,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -280,6 -355,8 +382,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -305,13 -382,17 +409,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -320,7 -401,9 +428,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,7 -465,7 +492,7 @@@ top_srcdir = @top_srcdir
@HAVE_OSS_TRUE at pkglib_LTLIBRARIES = oss.la
@HAVE_OSS_TRUE at AM_CFLAGS = $(CFLAGS) $(OSS_CFLAGS) -std=c99
@HAVE_OSS_TRUE at oss_la_SOURCES = oss.c
- @HAVE_OSS_TRUE at oss_la_LDFLAGS = -module
+ @HAVE_OSS_TRUE at oss_la_LDFLAGS = -module -avoid-version
all: all-am
.SUFFIXES:
@@@ -417,6 -500,7 +527,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -443,14 -527,17 +554,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
oss.la: $(oss_la_OBJECTS) $(oss_la_DEPENDENCIES) $(EXTRA_oss_la_DEPENDENCIES)
- $(oss_la_LINK) $(am_oss_la_rpath) $(oss_la_OBJECTS) $(oss_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(oss_la_LINK) $(am_oss_la_rpath) $(oss_la_OBJECTS) $(oss_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -461,25 -548,25 +575,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/oss.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -487,26 -574,15 +601,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -518,15 -594,11 +621,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -535,6 -607,21 +634,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -679,19 -766,20 +793,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/pltbrowser/Makefile.in
index bda1456,1504334..841ba40
--- a/plugins/pltbrowser/Makefile.in
+++ b/plugins/pltbrowser/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/pltbrowser
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -111,22 -139,16 +163,16 @@@ am__installdirs = "$(DESTDIR)$(pkglibdi
LTLIBRARIES = $(pkglib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_FALSE at pltbrowser_gtk2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at pltbrowser_gtk2_la_DEPENDENCIES = $(GTK_ROOT)/lib/libgtk-x11-2.0.la \
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgdk-x11-2.0.la \
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libpangoft2-1.0.la \
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libpangocairo-1.0.la \
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la \
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libcairo.la \
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libpango-1.0.la \
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgobject-2.0.la \
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgmodule-2.0.la \
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgthread-2.0.la \
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libglib-2.0.la
- am__pltbrowser_gtk2_la_SOURCES_DIST = pltbrowser.c
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk2_la_OBJECTS = pltbrowser_gtk2_la-pltbrowser.lo
+ am__pltbrowser_gtk2_la_SOURCES_DIST = pltbrowser.c support.c support.h
+ @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk2_la_OBJECTS = pltbrowser_gtk2_la-pltbrowser.lo \
+ @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@ pltbrowser_gtk2_la-support.lo
pltbrowser_gtk2_la_OBJECTS = $(am_pltbrowser_gtk2_la_OBJECTS)
- pltbrowser_gtk2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ pltbrowser_gtk2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) \
$(pltbrowser_gtk2_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk2_la_rpath = \
@@@ -135,12 -157,13 +181,13 @@@
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk2_la_rpath = \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@ -rpath \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@ $(pkglibdir)
- @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_FALSE at pltbrowser_gtk3_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk3_la_DEPENDENCIES = \
+ @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@ $(am__DEPENDENCIES_1)
am__pltbrowser_gtk3_la_SOURCES_DIST = pltbrowser.c
@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk3_la_OBJECTS = pltbrowser_gtk3_la-pltbrowser.lo
pltbrowser_gtk3_la_OBJECTS = $(am_pltbrowser_gtk3_la_OBJECTS)
- pltbrowser_gtk3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ pltbrowser_gtk3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(pltbrowser_gtk3_la_CFLAGS) $(CFLAGS) \
$(pltbrowser_gtk3_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk3_la_rpath = \
@@@ -149,19 -172,40 +196,40 @@@
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at am_pltbrowser_gtk3_la_rpath = \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@ -rpath \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@ $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(pltbrowser_gtk2_la_SOURCES) $(pltbrowser_gtk3_la_SOURCES)
DIST_SOURCES = $(am__pltbrowser_gtk2_la_SOURCES_DIST) \
$(am__pltbrowser_gtk3_la_SOURCES_DIST)
@@@ -170,6 -214,23 +238,26 @@@ am__can_run_installinfo =
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -196,6 -257,7 +284,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -216,10 -278,12 +305,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -242,6 -306,7 +333,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -295,6 -360,7 +387,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -313,6 -379,8 +406,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -338,13 -406,17 +433,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -353,7 -425,9 +452,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -415,20 -489,17 +516,17 @@@ top_srcdir = @top_srcdir
@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@HAVE_PLTBROWSER_TRUE at pkglib_LTLIBRARIES = pltbrowser_gtk2.la
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pkglib_LTLIBRARIES = pltbrowser_gtk2.la pltbrowser_gtk3.la
@HAVE_PLTBROWSER_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk2_la_SOURCES = pltbrowser.c
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk2_la_LDFLAGS = -module
+ @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk2_la_SOURCES = pltbrowser.c support.c support.h
+ @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk2_la_LDFLAGS = -module -avoid-version
@HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at GTK_ROOT = @top_srcdir@/$(LIB)/gtk-2.12.12/usr
@HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_FALSE at pltbrowser_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
- @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at pltbrowser_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
+ @HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at pltbrowser_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lrt
@HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_FALSE at pltbrowser_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
@HAVE_GTK2_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at pltbrowser_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
@HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk3_la_SOURCES = pltbrowser.c
- @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk3_la_LDFLAGS = -module
- @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at GTK_ROOT_300 = @top_srcdir@/$(LIB)/gtk-3.0.0
- @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_FALSE at pltbrowser_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
- @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at pltbrowser_gtk3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD)
- @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_FALSE at pltbrowser_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
- @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE@@STATICLINK_TRUE at pltbrowser_gtk3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS)
+ @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk3_la_LDFLAGS = -module -avoid-version
+ @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
+ @HAVE_GTK3_TRUE@@HAVE_PLTBROWSER_TRUE at pltbrowser_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
all: all-am
.SUFFIXES:
@@@ -463,6 -534,7 +561,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -489,16 -561,20 +588,20 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
pltbrowser_gtk2.la: $(pltbrowser_gtk2_la_OBJECTS) $(pltbrowser_gtk2_la_DEPENDENCIES) $(EXTRA_pltbrowser_gtk2_la_DEPENDENCIES)
- $(pltbrowser_gtk2_la_LINK) $(am_pltbrowser_gtk2_la_rpath) $(pltbrowser_gtk2_la_OBJECTS) $(pltbrowser_gtk2_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(pltbrowser_gtk2_la_LINK) $(am_pltbrowser_gtk2_la_rpath) $(pltbrowser_gtk2_la_OBJECTS) $(pltbrowser_gtk2_la_LIBADD) $(LIBS)
+
pltbrowser_gtk3.la: $(pltbrowser_gtk3_la_OBJECTS) $(pltbrowser_gtk3_la_DEPENDENCIES) $(EXTRA_pltbrowser_gtk3_la_DEPENDENCIES)
- $(pltbrowser_gtk3_la_LINK) $(am_pltbrowser_gtk3_la_rpath) $(pltbrowser_gtk3_la_OBJECTS) $(pltbrowser_gtk3_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(pltbrowser_gtk3_la_LINK) $(am_pltbrowser_gtk3_la_rpath) $(pltbrowser_gtk3_la_OBJECTS) $(pltbrowser_gtk3_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -507,42 -583,50 +610,50 @@@ distclean-compile
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pltbrowser_gtk2_la-support.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
pltbrowser_gtk2_la-pltbrowser.lo: pltbrowser.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) -MT pltbrowser_gtk2_la-pltbrowser.lo -MD -MP -MF $(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Tpo -c -o pltbrowser_gtk2_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Tpo $(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pltbrowser.c' object='pltbrowser_gtk2_la-pltbrowser.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) -MT pltbrowser_gtk2_la-pltbrowser.lo -MD -MP -MF $(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Tpo -c -o pltbrowser_gtk2_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Tpo $(DEPDIR)/pltbrowser_gtk2_la-pltbrowser.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pltbrowser.c' object='pltbrowser_gtk2_la-pltbrowser.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) -c -o pltbrowser_gtk2_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) -c -o pltbrowser_gtk2_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
+
+ pltbrowser_gtk2_la-support.lo: support.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) -MT pltbrowser_gtk2_la-support.lo -MD -MP -MF $(DEPDIR)/pltbrowser_gtk2_la-support.Tpo -c -o pltbrowser_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pltbrowser_gtk2_la-support.Tpo $(DEPDIR)/pltbrowser_gtk2_la-support.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='support.c' object='pltbrowser_gtk2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk2_la_CFLAGS) $(CFLAGS) -c -o pltbrowser_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
pltbrowser_gtk3_la-pltbrowser.lo: pltbrowser.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk3_la_CFLAGS) $(CFLAGS) -MT pltbrowser_gtk3_la-pltbrowser.lo -MD -MP -MF $(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Tpo -c -o pltbrowser_gtk3_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Tpo $(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pltbrowser.c' object='pltbrowser_gtk3_la-pltbrowser.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk3_la_CFLAGS) $(CFLAGS) -MT pltbrowser_gtk3_la-pltbrowser.lo -MD -MP -MF $(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Tpo -c -o pltbrowser_gtk3_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Tpo $(DEPDIR)/pltbrowser_gtk3_la-pltbrowser.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pltbrowser.c' object='pltbrowser_gtk3_la-pltbrowser.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk3_la_CFLAGS) $(CFLAGS) -c -o pltbrowser_gtk3_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pltbrowser_gtk3_la_CFLAGS) $(CFLAGS) -c -o pltbrowser_gtk3_la-pltbrowser.lo `test -f 'pltbrowser.c' || echo '$(srcdir)/'`pltbrowser.c
mostlyclean-libtool:
-rm -f *.lo
@@@ -550,26 -634,15 +661,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -581,15 -654,11 +681,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -598,6 -667,21 +694,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -742,19 -826,20 +853,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/pulse/Makefile.in
index 2622226,0938cc3..e028b4b
--- a/plugins/pulse/Makefile.in
+++ b/plugins/pulse/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/pulse
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -114,23 -142,48 +166,48 @@@ am__DEPENDENCIES_1
am__pulse_la_SOURCES_DIST = pulse.c
@HAVE_PULSE_TRUE at am_pulse_la_OBJECTS = pulse.lo
pulse_la_OBJECTS = $(am_pulse_la_OBJECTS)
- pulse_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(pulse_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ pulse_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(pulse_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_PULSE_TRUE at am_pulse_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(pulse_la_SOURCES)
DIST_SOURCES = $(am__pulse_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -191,23 +215,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -234,7 +261,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -255,12 +282,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -283,7 +310,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -337,7 +364,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -356,8 +383,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -383,17 +410,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -402,9 +429,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -383,7 -466,7 +493,7 @@@ top_srcdir = @top_srcdir
@HAVE_PULSE_TRUE at pkglib_LTLIBRARIES = pulse.la
@HAVE_PULSE_TRUE at AM_CFLAGS = $(CFLAGS) $(PULSE_DEPS_CFLAGS) -std=c99
@HAVE_PULSE_TRUE at pulse_la_SOURCES = pulse.c
- @HAVE_PULSE_TRUE at pulse_la_LDFLAGS = -module
+ @HAVE_PULSE_TRUE at pulse_la_LDFLAGS = -module -avoid-version
@HAVE_PULSE_TRUE at pulse_la_LIBADD = $(LDADD) $(PULSE_DEPS_LIBS)
all: all-am
@@@ -419,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
pulse.la: $(pulse_la_OBJECTS) $(pulse_la_DEPENDENCIES) $(EXTRA_pulse_la_DEPENDENCIES)
- $(pulse_la_LINK) $(am_pulse_la_rpath) $(pulse_la_OBJECTS) $(pulse_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(pulse_la_LINK) $(am_pulse_la_rpath) $(pulse_la_OBJECTS) $(pulse_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pulse.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/shellexec/Makefile.in
index e0996ea,5a860ba..f374b9b
--- a/plugins/shellexec/Makefile.in
+++ b/plugins/shellexec/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/shellexec
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -113,23 -141,48 +165,48 @@@ shellexec_la_DEPENDENCIES
am__shellexec_la_SOURCES_DIST = shellexec.c shellexec.h
@HAVE_SHELLEXEC_TRUE at am_shellexec_la_OBJECTS = shellexec.lo
shellexec_la_OBJECTS = $(am_shellexec_la_OBJECTS)
- shellexec_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ shellexec_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(shellexec_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_SHELLEXEC_TRUE at am_shellexec_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(shellexec_la_SOURCES)
DIST_SOURCES = $(am__shellexec_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -137,6 -190,23 +214,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -163,6 -233,7 +260,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -183,10 -254,12 +281,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -209,6 -282,7 +309,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -262,6 -336,7 +363,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -280,6 -355,8 +382,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -305,13 -382,17 +409,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -320,7 -401,9 +428,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -381,7 -464,7 +491,7 @@@ top_srcdir = @top_srcdir
@HAVE_SHELLEXEC_TRUE at shxdir = $(libdir)/$(PACKAGE)
@HAVE_SHELLEXEC_TRUE at pkglib_LTLIBRARIES = shellexec.la
@HAVE_SHELLEXEC_TRUE at shellexec_la_SOURCES = shellexec.c shellexec.h
- @HAVE_SHELLEXEC_TRUE at shellexec_la_LDFLAGS = -module
+ @HAVE_SHELLEXEC_TRUE at shellexec_la_LDFLAGS = -module -avoid-version
@HAVE_SHELLEXEC_TRUE at shellexec_la_LIBADD = $(LDADD)
@HAVE_SHELLEXEC_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
all: all-am
@@@ -418,6 -501,7 +528,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -444,14 -528,17 +555,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
shellexec.la: $(shellexec_la_OBJECTS) $(shellexec_la_DEPENDENCIES) $(EXTRA_shellexec_la_DEPENDENCIES)
- $(shellexec_la_LINK) $(am_shellexec_la_rpath) $(shellexec_la_OBJECTS) $(shellexec_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(shellexec_la_LINK) $(am_shellexec_la_rpath) $(shellexec_la_OBJECTS) $(shellexec_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -462,25 -549,25 +576,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shellexec.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -488,26 -575,15 +602,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -519,15 -595,11 +622,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -536,6 -608,21 +635,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -680,19 -767,20 +794,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/shellexecui/Makefile.in
index f5a542a,01aff3e..8083e7e
--- a/plugins/shellexecui/Makefile.in
+++ b/plugins/shellexecui/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/shellexecui
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -111,17 -139,6 +163,6 @@@ am__installdirs = "$(DESTDIR)$(pkglibdi
LTLIBRARIES = $(pkglib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_FALSE at shellexecui_gtk2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at shellexecui_gtk2_la_DEPENDENCIES = $(GTK_ROOT)/lib/libgtk-x11-2.0.la \
- @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgdk-x11-2.0.la \
- @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libpangoft2-1.0.la \
- @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libpangocairo-1.0.la \
- @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la \
- @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libcairo.la \
- @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libpango-1.0.la \
- @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgobject-2.0.la \
- @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgmodule-2.0.la \
- @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libgthread-2.0.la \
- @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE@ $(GTK_ROOT)/lib/libglib-2.0.la
am__shellexecui_gtk2_la_SOURCES_DIST = shellexecui.c interface.c \
support.c callbacks.c interface.h support.h callbacks.h
@HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE at am_shellexecui_gtk2_la_OBJECTS = shellexecui_gtk2_la-shellexecui.lo \
@@@ -129,8 -146,12 +170,12 @@@
@HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@ shellexecui_gtk2_la-support.lo \
@HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@ shellexecui_gtk2_la-callbacks.lo
shellexecui_gtk2_la_OBJECTS = $(am_shellexecui_gtk2_la_OBJECTS)
- shellexecui_gtk2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ shellexecui_gtk2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) \
$(shellexecui_gtk2_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@HAVE_SHELLEXECUI_TRUE at am_shellexecui_gtk2_la_rpath = -rpath \
@@@ -138,7 -159,8 +183,8 @@@
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at am_shellexecui_gtk2_la_rpath = \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@ -rpath \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@ $(pkglibdir)
- @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_FALSE at shellexecui_gtk3_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk3_la_DEPENDENCIES = \
+ @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@ $(am__DEPENDENCIES_1)
am__shellexecui_gtk3_la_SOURCES_DIST = shellexecui.c interface.c \
support.c callbacks.c interface.h support.h callbacks.h
@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at am_shellexecui_gtk3_la_OBJECTS = shellexecui_gtk3_la-shellexecui.lo \
@@@ -146,8 -168,8 +192,8 @@@
@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@ shellexecui_gtk3_la-support.lo \
@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@ shellexecui_gtk3_la-callbacks.lo
shellexecui_gtk3_la_OBJECTS = $(am_shellexecui_gtk3_la_OBJECTS)
- shellexecui_gtk3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ shellexecui_gtk3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) \
$(shellexecui_gtk3_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at am_shellexecui_gtk3_la_rpath = -rpath \
@@@ -155,19 -177,40 +201,40 @@@
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at am_shellexecui_gtk3_la_rpath = \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@ -rpath \
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@ $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(shellexecui_gtk2_la_SOURCES) \
$(shellexecui_gtk3_la_SOURCES)
DIST_SOURCES = $(am__shellexecui_gtk2_la_SOURCES_DIST) \
@@@ -177,6 -220,23 +244,26 @@@ am__can_run_installinfo =
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -203,6 -263,7 +290,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -223,10 -284,12 +311,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -249,6 -312,7 +339,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -302,6 -366,7 +393,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -320,6 -385,8 +412,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -345,13 -412,17 +439,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -360,7 -431,9 +458,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -424,19 -497,16 +524,16 @@@ top_srcdir = @top_srcdir
@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at pkglib_LTLIBRARIES = shellexecui_gtk2.la shellexecui_gtk3.la
@HAVE_SHELLEXECUI_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
@HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk2_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h
- @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk2_la_LDFLAGS = -module
+ @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk2_la_LDFLAGS = -module -avoid-version
@HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at GTK_ROOT = @top_srcdir@/$(LIB)/gtk-2.12.12/usr
@HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_FALSE at shellexecui_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
- @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at shellexecui_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
+ @HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at shellexecui_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lrt
@HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_FALSE at shellexecui_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
@HAVE_GTK2_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at shellexecui_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
@HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk3_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h
- @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk3_la_LDFLAGS = -module
- @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at GTK_ROOT_300 = @top_srcdir@/$(LIB)/gtk-3.0.0
- @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_FALSE at shellexecui_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
- @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at shellexecui_gtk3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD)
- @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_FALSE at shellexecui_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
- @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE@@STATICLINK_TRUE at shellexecui_gtk3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS)
+ @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk3_la_LDFLAGS = -module -avoid-version
+ @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
+ @HAVE_GTK3_TRUE@@HAVE_SHELLEXECUI_TRUE at shellexecui_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
all: all-am
.SUFFIXES:
@@@ -471,6 -541,7 +568,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -497,16 -568,20 +595,20 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
shellexecui_gtk2.la: $(shellexecui_gtk2_la_OBJECTS) $(shellexecui_gtk2_la_DEPENDENCIES) $(EXTRA_shellexecui_gtk2_la_DEPENDENCIES)
- $(shellexecui_gtk2_la_LINK) $(am_shellexecui_gtk2_la_rpath) $(shellexecui_gtk2_la_OBJECTS) $(shellexecui_gtk2_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(shellexecui_gtk2_la_LINK) $(am_shellexecui_gtk2_la_rpath) $(shellexecui_gtk2_la_OBJECTS) $(shellexecui_gtk2_la_LIBADD) $(LIBS)
+
shellexecui_gtk3.la: $(shellexecui_gtk3_la_OBJECTS) $(shellexecui_gtk3_la_DEPENDENCIES) $(EXTRA_shellexecui_gtk3_la_DEPENDENCIES)
- $(shellexecui_gtk3_la_LINK) $(am_shellexecui_gtk3_la_rpath) $(shellexecui_gtk3_la_OBJECTS) $(shellexecui_gtk3_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(shellexecui_gtk3_la_LINK) $(am_shellexecui_gtk3_la_rpath) $(shellexecui_gtk3_la_OBJECTS) $(shellexecui_gtk3_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -524,81 -599,81 +626,81 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shellexecui_gtk3_la-support.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
shellexecui_gtk2_la-shellexecui.lo: shellexecui.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-shellexecui.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-shellexecui.Tpo -c -o shellexecui_gtk2_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/shellexecui_gtk2_la-shellexecui.Tpo $(DEPDIR)/shellexecui_gtk2_la-shellexecui.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='shellexecui.c' object='shellexecui_gtk2_la-shellexecui.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-shellexecui.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-shellexecui.Tpo -c -o shellexecui_gtk2_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk2_la-shellexecui.Tpo $(DEPDIR)/shellexecui_gtk2_la-shellexecui.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shellexecui.c' object='shellexecui_gtk2_la-shellexecui.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
shellexecui_gtk2_la-interface.lo: interface.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-interface.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-interface.Tpo -c -o shellexecui_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/shellexecui_gtk2_la-interface.Tpo $(DEPDIR)/shellexecui_gtk2_la-interface.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='interface.c' object='shellexecui_gtk2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-interface.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-interface.Tpo -c -o shellexecui_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk2_la-interface.Tpo $(DEPDIR)/shellexecui_gtk2_la-interface.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='interface.c' object='shellexecui_gtk2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
shellexecui_gtk2_la-support.lo: support.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-support.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-support.Tpo -c -o shellexecui_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/shellexecui_gtk2_la-support.Tpo $(DEPDIR)/shellexecui_gtk2_la-support.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='support.c' object='shellexecui_gtk2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-support.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-support.Tpo -c -o shellexecui_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk2_la-support.Tpo $(DEPDIR)/shellexecui_gtk2_la-support.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='support.c' object='shellexecui_gtk2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
shellexecui_gtk2_la-callbacks.lo: callbacks.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-callbacks.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-callbacks.Tpo -c -o shellexecui_gtk2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/shellexecui_gtk2_la-callbacks.Tpo $(DEPDIR)/shellexecui_gtk2_la-callbacks.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='callbacks.c' object='shellexecui_gtk2_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk2_la-callbacks.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk2_la-callbacks.Tpo -c -o shellexecui_gtk2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk2_la-callbacks.Tpo $(DEPDIR)/shellexecui_gtk2_la-callbacks.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callbacks.c' object='shellexecui_gtk2_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk2_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
shellexecui_gtk3_la-shellexecui.lo: shellexecui.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-shellexecui.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-shellexecui.Tpo -c -o shellexecui_gtk3_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/shellexecui_gtk3_la-shellexecui.Tpo $(DEPDIR)/shellexecui_gtk3_la-shellexecui.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='shellexecui.c' object='shellexecui_gtk3_la-shellexecui.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-shellexecui.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-shellexecui.Tpo -c -o shellexecui_gtk3_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk3_la-shellexecui.Tpo $(DEPDIR)/shellexecui_gtk3_la-shellexecui.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shellexecui.c' object='shellexecui_gtk3_la-shellexecui.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-shellexecui.lo `test -f 'shellexecui.c' || echo '$(srcdir)/'`shellexecui.c
shellexecui_gtk3_la-interface.lo: interface.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-interface.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-interface.Tpo -c -o shellexecui_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/shellexecui_gtk3_la-interface.Tpo $(DEPDIR)/shellexecui_gtk3_la-interface.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='interface.c' object='shellexecui_gtk3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-interface.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-interface.Tpo -c -o shellexecui_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk3_la-interface.Tpo $(DEPDIR)/shellexecui_gtk3_la-interface.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='interface.c' object='shellexecui_gtk3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
shellexecui_gtk3_la-support.lo: support.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-support.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-support.Tpo -c -o shellexecui_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/shellexecui_gtk3_la-support.Tpo $(DEPDIR)/shellexecui_gtk3_la-support.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='support.c' object='shellexecui_gtk3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-support.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-support.Tpo -c -o shellexecui_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk3_la-support.Tpo $(DEPDIR)/shellexecui_gtk3_la-support.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='support.c' object='shellexecui_gtk3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
shellexecui_gtk3_la-callbacks.lo: callbacks.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-callbacks.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-callbacks.Tpo -c -o shellexecui_gtk3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/shellexecui_gtk3_la-callbacks.Tpo $(DEPDIR)/shellexecui_gtk3_la-callbacks.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='callbacks.c' object='shellexecui_gtk3_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -MT shellexecui_gtk3_la-callbacks.lo -MD -MP -MF $(DEPDIR)/shellexecui_gtk3_la-callbacks.Tpo -c -o shellexecui_gtk3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shellexecui_gtk3_la-callbacks.Tpo $(DEPDIR)/shellexecui_gtk3_la-callbacks.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callbacks.c' object='shellexecui_gtk3_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shellexecui_gtk3_la_CFLAGS) $(CFLAGS) -c -o shellexecui_gtk3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
mostlyclean-libtool:
-rm -f *.lo
@@@ -606,26 -681,15 +708,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -637,15 -701,11 +728,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -654,6 -714,21 +741,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -798,19 -873,20 +900,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/shn/Makefile.in
index 8882b46,c1233d9..8be1ae8
--- a/plugins/shn/Makefile.in
+++ b/plugins/shn/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,8 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/shn
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- AUTHORS
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp AUTHORS COPYING README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -118,23 -145,48 +169,48 @@@ am__ddb_shn_la_SOURCES_DIST = array.c c
@HAVE_SHN_TRUE@ output.lo seek.lo shn.lo shorten.lo \
@HAVE_SHN_TRUE@ sulawalaw.lo vario.lo wave.lo
ddb_shn_la_OBJECTS = $(am_ddb_shn_la_OBJECTS)
- ddb_shn_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ ddb_shn_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(ddb_shn_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_SHN_TRUE at am_ddb_shn_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(ddb_shn_la_SOURCES)
DIST_SOURCES = $(am__ddb_shn_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -142,6 -194,23 +218,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -168,6 -237,7 +264,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -188,10 -258,12 +285,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -214,6 -286,7 +313,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -267,6 -340,7 +367,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -285,6 -359,8 +386,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -310,13 -386,17 +413,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -325,7 -405,9 +432,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -386,7 -468,7 +495,7 @@@ top_srcdir = @top_srcdir
@HAVE_SHN_TRUE at shndir = $(libdir)/$(PACKAGE)
@HAVE_SHN_TRUE at pkglib_LTLIBRARIES = ddb_shn.la
@HAVE_SHN_TRUE at ddb_shn_la_SOURCES = array.c convert.c misc.c output.c seek.c shn.c shn.h shorten.c shorten.h sulawalaw.c vario.c wave.c bitshift.h
- @HAVE_SHN_TRUE at ddb_shn_la_LDFLAGS = -module
+ @HAVE_SHN_TRUE at ddb_shn_la_LDFLAGS = -module -avoid-version
@HAVE_SHN_TRUE at ddb_shn_la_LIBADD = $(LDADD) -lm
@HAVE_SHN_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
all: all-am
@@@ -423,6 -505,7 +532,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -449,14 -532,17 +559,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
ddb_shn.la: $(ddb_shn_la_OBJECTS) $(ddb_shn_la_DEPENDENCIES) $(EXTRA_ddb_shn_la_DEPENDENCIES)
- $(ddb_shn_la_LINK) $(am_ddb_shn_la_rpath) $(ddb_shn_la_OBJECTS) $(ddb_shn_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(ddb_shn_la_LINK) $(am_ddb_shn_la_rpath) $(ddb_shn_la_OBJECTS) $(ddb_shn_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -476,25 -562,25 +589,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wave.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -502,26 -588,15 +615,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -533,15 -608,11 +635,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -550,6 -621,21 +648,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -694,19 -780,20 +807,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/sid/Makefile.in
index c6c2be0,cf1c5c1..f9db4e1
--- a/plugins/sid/Makefile.in
+++ b/plugins/sid/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/sid
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -210,32 -238,66 +262,66 @@@ am__sid_la_SOURCES_DIST = plugin.c csid
@HAVE_SID_TRUE@ envelope.lo voice.lo sid.lo wave8580__ST.lo \
@HAVE_SID_TRUE@ wave8580_P_T.lo reloc65.lo
sid_la_OBJECTS = $(am_sid_la_OBJECTS)
- sid_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(sid_la_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ sid_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(sid_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_SID_TRUE at am_sid_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+ AM_V_CXX = $(am__v_CXX_ at AM_V@)
+ am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+ am__v_CXX_0 = @echo " CXX " $@;
+ am__v_CXX_1 =
CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+ am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+ am__v_CXXLD_0 = @echo " CXXLD " $@;
+ am__v_CXXLD_1 =
SOURCES = $(sid_la_SOURCES)
DIST_SOURCES = $(am__sid_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -243,6 -305,23 +329,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -269,6 -348,7 +375,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -289,10 -369,12 +396,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -315,6 -397,7 +424,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -368,6 -451,7 +478,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -386,6 -470,8 +497,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -411,13 -497,17 +524,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -426,7 -516,9 +543,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -588,7 -680,7 +707,7 @@@ top_srcdir = @top_srcdir
@HAVE_SID_TRUE at sidplay-libs/libsidplay/src/psiddrv.bin\
@HAVE_SID_TRUE at sidplay-libs/libsidplay/src/poweron.bin
- @HAVE_SID_TRUE at sid_la_LDFLAGS = -module $(NOCPPLIB)
+ @HAVE_SID_TRUE at sid_la_LDFLAGS = -module -avoid-version $(NOCPPLIB)
@HAVE_SID_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include -fPIC
@HAVE_SID_TRUE at AM_CPPFLAGS = $(CXXFLAGS) -DHAVE_UNIX -I$(sidpath) -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -fno-exceptions -fno-rtti -fno-unwind-tables
all: all-am
@@@ -625,6 -717,7 +744,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -651,14 -744,17 +771,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
sid.la: $(sid_la_OBJECTS) $(sid_la_DEPENDENCIES) $(EXTRA_sid_la_DEPENDENCIES)
- $(sid_la_LINK) $(am_sid_la_rpath) $(sid_la_OBJECTS) $(sid_la_LIBADD) $(LIBS)
+ $(AM_V_CXXLD)$(sid_la_LINK) $(am_sid_la_rpath) $(sid_la_OBJECTS) $(sid_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -707,305 -803,305 +830,305 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xsid.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
reloc65.lo: sidplay-libs/libsidplay/src/reloc65.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reloc65.lo -MD -MP -MF $(DEPDIR)/reloc65.Tpo -c -o reloc65.lo `test -f 'sidplay-libs/libsidplay/src/reloc65.c' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/reloc65.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/reloc65.Tpo $(DEPDIR)/reloc65.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sidplay-libs/libsidplay/src/reloc65.c' object='reloc65.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reloc65.lo -MD -MP -MF $(DEPDIR)/reloc65.Tpo -c -o reloc65.lo `test -f 'sidplay-libs/libsidplay/src/reloc65.c' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/reloc65.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reloc65.Tpo $(DEPDIR)/reloc65.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sidplay-libs/libsidplay/src/reloc65.c' object='reloc65.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reloc65.lo `test -f 'sidplay-libs/libsidplay/src/reloc65.c' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/reloc65.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reloc65.lo `test -f 'sidplay-libs/libsidplay/src/reloc65.c' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/reloc65.c
.cpp.o:
- @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cpp.obj:
- @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cpp.lo:
- @am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
mixer.lo: sidplay-libs/libsidplay/src/mixer.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mixer.lo -MD -MP -MF $(DEPDIR)/mixer.Tpo -c -o mixer.lo `test -f 'sidplay-libs/libsidplay/src/mixer.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mixer.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/mixer.Tpo $(DEPDIR)/mixer.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/mixer.cpp' object='mixer.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mixer.lo -MD -MP -MF $(DEPDIR)/mixer.Tpo -c -o mixer.lo `test -f 'sidplay-libs/libsidplay/src/mixer.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mixer.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mixer.Tpo $(DEPDIR)/mixer.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/mixer.cpp' object='mixer.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mixer.lo `test -f 'sidplay-libs/libsidplay/src/mixer.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mixer.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mixer.lo `test -f 'sidplay-libs/libsidplay/src/mixer.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mixer.cpp
player.lo: sidplay-libs/libsidplay/src/player.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.lo -MD -MP -MF $(DEPDIR)/player.Tpo -c -o player.lo `test -f 'sidplay-libs/libsidplay/src/player.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/player.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/player.Tpo $(DEPDIR)/player.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/player.cpp' object='player.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.lo -MD -MP -MF $(DEPDIR)/player.Tpo -c -o player.lo `test -f 'sidplay-libs/libsidplay/src/player.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/player.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/player.Tpo $(DEPDIR)/player.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/player.cpp' object='player.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.lo `test -f 'sidplay-libs/libsidplay/src/player.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/player.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.lo `test -f 'sidplay-libs/libsidplay/src/player.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/player.cpp
mos656x.lo: sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos656x.lo -MD -MP -MF $(DEPDIR)/mos656x.Tpo -c -o mos656x.lo `test -f 'sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/mos656x.Tpo $(DEPDIR)/mos656x.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' object='mos656x.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos656x.lo -MD -MP -MF $(DEPDIR)/mos656x.Tpo -c -o mos656x.lo `test -f 'sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mos656x.Tpo $(DEPDIR)/mos656x.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' object='mos656x.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos656x.lo `test -f 'sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos656x.lo `test -f 'sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
mos6510.lo: sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos6510.lo -MD -MP -MF $(DEPDIR)/mos6510.Tpo -c -o mos6510.lo `test -f 'sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/mos6510.Tpo $(DEPDIR)/mos6510.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' object='mos6510.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos6510.lo -MD -MP -MF $(DEPDIR)/mos6510.Tpo -c -o mos6510.lo `test -f 'sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mos6510.Tpo $(DEPDIR)/mos6510.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' object='mos6510.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos6510.lo `test -f 'sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos6510.lo `test -f 'sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
sid6526.lo: sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sid6526.lo -MD -MP -MF $(DEPDIR)/sid6526.Tpo -c -o sid6526.lo `test -f 'sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/sid6526.Tpo $(DEPDIR)/sid6526.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' object='sid6526.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sid6526.lo -MD -MP -MF $(DEPDIR)/sid6526.Tpo -c -o sid6526.lo `test -f 'sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sid6526.Tpo $(DEPDIR)/sid6526.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' object='sid6526.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sid6526.lo `test -f 'sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sid6526.lo `test -f 'sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
MUS.lo: sidplay-libs/libsidplay/src/sidtune/MUS.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MUS.lo -MD -MP -MF $(DEPDIR)/MUS.Tpo -c -o MUS.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/MUS.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/MUS.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/MUS.Tpo $(DEPDIR)/MUS.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/sidtune/MUS.cpp' object='MUS.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MUS.lo -MD -MP -MF $(DEPDIR)/MUS.Tpo -c -o MUS.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/MUS.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/MUS.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/MUS.Tpo $(DEPDIR)/MUS.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/MUS.cpp' object='MUS.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MUS.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/MUS.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/MUS.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MUS.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/MUS.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/MUS.cpp
SidTuneTools.lo: sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SidTuneTools.lo -MD -MP -MF $(DEPDIR)/SidTuneTools.Tpo -c -o SidTuneTools.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/SidTuneTools.Tpo $(DEPDIR)/SidTuneTools.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' object='SidTuneTools.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SidTuneTools.lo -MD -MP -MF $(DEPDIR)/SidTuneTools.Tpo -c -o SidTuneTools.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/SidTuneTools.Tpo $(DEPDIR)/SidTuneTools.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' object='SidTuneTools.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SidTuneTools.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SidTuneTools.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
InfoFile.lo: sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT InfoFile.lo -MD -MP -MF $(DEPDIR)/InfoFile.Tpo -c -o InfoFile.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/InfoFile.Tpo $(DEPDIR)/InfoFile.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' object='InfoFile.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT InfoFile.lo -MD -MP -MF $(DEPDIR)/InfoFile.Tpo -c -o InfoFile.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/InfoFile.Tpo $(DEPDIR)/InfoFile.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' object='InfoFile.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o InfoFile.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o InfoFile.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
SidTune.lo: sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SidTune.lo -MD -MP -MF $(DEPDIR)/SidTune.Tpo -c -o SidTune.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/SidTune.Tpo $(DEPDIR)/SidTune.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' object='SidTune.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SidTune.lo -MD -MP -MF $(DEPDIR)/SidTune.Tpo -c -o SidTune.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/SidTune.Tpo $(DEPDIR)/SidTune.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' object='SidTune.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SidTune.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SidTune.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
PSID.lo: sidplay-libs/libsidplay/src/sidtune/PSID.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSID.lo -MD -MP -MF $(DEPDIR)/PSID.Tpo -c -o PSID.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PSID.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PSID.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/PSID.Tpo $(DEPDIR)/PSID.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/sidtune/PSID.cpp' object='PSID.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSID.lo -MD -MP -MF $(DEPDIR)/PSID.Tpo -c -o PSID.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PSID.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PSID.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/PSID.Tpo $(DEPDIR)/PSID.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/PSID.cpp' object='PSID.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PSID.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PSID.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PSID.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PSID.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PSID.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PSID.cpp
PP20.lo: sidplay-libs/libsidplay/src/sidtune/PP20.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PP20.lo -MD -MP -MF $(DEPDIR)/PP20.Tpo -c -o PP20.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PP20.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PP20.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/PP20.Tpo $(DEPDIR)/PP20.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/sidtune/PP20.cpp' object='PP20.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PP20.lo -MD -MP -MF $(DEPDIR)/PP20.Tpo -c -o PP20.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PP20.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PP20.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/PP20.Tpo $(DEPDIR)/PP20.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/PP20.cpp' object='PP20.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PP20.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PP20.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PP20.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PP20.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PP20.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PP20.cpp
IconInfo.lo: sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT IconInfo.lo -MD -MP -MF $(DEPDIR)/IconInfo.Tpo -c -o IconInfo.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/IconInfo.Tpo $(DEPDIR)/IconInfo.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' object='IconInfo.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT IconInfo.lo -MD -MP -MF $(DEPDIR)/IconInfo.Tpo -c -o IconInfo.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/IconInfo.Tpo $(DEPDIR)/IconInfo.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' object='IconInfo.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o IconInfo.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o IconInfo.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
event.lo: sidplay-libs/libsidplay/src/event.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event.lo -MD -MP -MF $(DEPDIR)/event.Tpo -c -o event.lo `test -f 'sidplay-libs/libsidplay/src/event.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/event.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/event.Tpo $(DEPDIR)/event.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/event.cpp' object='event.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event.lo -MD -MP -MF $(DEPDIR)/event.Tpo -c -o event.lo `test -f 'sidplay-libs/libsidplay/src/event.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/event.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/event.Tpo $(DEPDIR)/event.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/event.cpp' object='event.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event.lo `test -f 'sidplay-libs/libsidplay/src/event.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/event.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event.lo `test -f 'sidplay-libs/libsidplay/src/event.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/event.cpp
psiddrv.lo: sidplay-libs/libsidplay/src/psiddrv.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT psiddrv.lo -MD -MP -MF $(DEPDIR)/psiddrv.Tpo -c -o psiddrv.lo `test -f 'sidplay-libs/libsidplay/src/psiddrv.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/psiddrv.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/psiddrv.Tpo $(DEPDIR)/psiddrv.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/psiddrv.cpp' object='psiddrv.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT psiddrv.lo -MD -MP -MF $(DEPDIR)/psiddrv.Tpo -c -o psiddrv.lo `test -f 'sidplay-libs/libsidplay/src/psiddrv.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/psiddrv.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/psiddrv.Tpo $(DEPDIR)/psiddrv.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/psiddrv.cpp' object='psiddrv.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o psiddrv.lo `test -f 'sidplay-libs/libsidplay/src/psiddrv.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/psiddrv.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o psiddrv.lo `test -f 'sidplay-libs/libsidplay/src/psiddrv.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/psiddrv.cpp
config.lo: sidplay-libs/libsidplay/src/config.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.lo -MD -MP -MF $(DEPDIR)/config.Tpo -c -o config.lo `test -f 'sidplay-libs/libsidplay/src/config.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/config.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/config.Tpo $(DEPDIR)/config.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/config.cpp' object='config.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.lo -MD -MP -MF $(DEPDIR)/config.Tpo -c -o config.lo `test -f 'sidplay-libs/libsidplay/src/config.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/config.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/config.Tpo $(DEPDIR)/config.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/config.cpp' object='config.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.lo `test -f 'sidplay-libs/libsidplay/src/config.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/config.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.lo `test -f 'sidplay-libs/libsidplay/src/config.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/config.cpp
sidplay2.lo: sidplay-libs/libsidplay/src/sidplay2.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sidplay2.lo -MD -MP -MF $(DEPDIR)/sidplay2.Tpo -c -o sidplay2.lo `test -f 'sidplay-libs/libsidplay/src/sidplay2.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidplay2.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/sidplay2.Tpo $(DEPDIR)/sidplay2.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/sidplay2.cpp' object='sidplay2.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sidplay2.lo -MD -MP -MF $(DEPDIR)/sidplay2.Tpo -c -o sidplay2.lo `test -f 'sidplay-libs/libsidplay/src/sidplay2.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidplay2.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sidplay2.Tpo $(DEPDIR)/sidplay2.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/sidplay2.cpp' object='sidplay2.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sidplay2.lo `test -f 'sidplay-libs/libsidplay/src/sidplay2.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidplay2.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sidplay2.lo `test -f 'sidplay-libs/libsidplay/src/sidplay2.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidplay2.cpp
xsid.lo: sidplay-libs/libsidplay/src/xsid/xsid.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xsid.lo -MD -MP -MF $(DEPDIR)/xsid.Tpo -c -o xsid.lo `test -f 'sidplay-libs/libsidplay/src/xsid/xsid.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/xsid/xsid.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/xsid.Tpo $(DEPDIR)/xsid.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/xsid/xsid.cpp' object='xsid.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xsid.lo -MD -MP -MF $(DEPDIR)/xsid.Tpo -c -o xsid.lo `test -f 'sidplay-libs/libsidplay/src/xsid/xsid.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/xsid/xsid.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xsid.Tpo $(DEPDIR)/xsid.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/xsid/xsid.cpp' object='xsid.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xsid.lo `test -f 'sidplay-libs/libsidplay/src/xsid/xsid.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/xsid/xsid.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xsid.lo `test -f 'sidplay-libs/libsidplay/src/xsid/xsid.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/xsid/xsid.cpp
mos6526.lo: sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos6526.lo -MD -MP -MF $(DEPDIR)/mos6526.Tpo -c -o mos6526.lo `test -f 'sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/mos6526.Tpo $(DEPDIR)/mos6526.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' object='mos6526.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos6526.lo -MD -MP -MF $(DEPDIR)/mos6526.Tpo -c -o mos6526.lo `test -f 'sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mos6526.Tpo $(DEPDIR)/mos6526.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' object='mos6526.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos6526.lo `test -f 'sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos6526.lo `test -f 'sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
resid.lo: sidplay-libs/builders/resid-builder/src/resid.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resid.lo -MD -MP -MF $(DEPDIR)/resid.Tpo -c -o resid.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/resid.Tpo $(DEPDIR)/resid.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/builders/resid-builder/src/resid.cpp' object='resid.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resid.lo -MD -MP -MF $(DEPDIR)/resid.Tpo -c -o resid.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/resid.Tpo $(DEPDIR)/resid.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/builders/resid-builder/src/resid.cpp' object='resid.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resid.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resid.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid.cpp
resid-builder.lo: sidplay-libs/builders/resid-builder/src/resid-builder.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resid-builder.lo -MD -MP -MF $(DEPDIR)/resid-builder.Tpo -c -o resid-builder.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid-builder.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid-builder.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/resid-builder.Tpo $(DEPDIR)/resid-builder.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/builders/resid-builder/src/resid-builder.cpp' object='resid-builder.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resid-builder.lo -MD -MP -MF $(DEPDIR)/resid-builder.Tpo -c -o resid-builder.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid-builder.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid-builder.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/resid-builder.Tpo $(DEPDIR)/resid-builder.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/builders/resid-builder/src/resid-builder.cpp' object='resid-builder.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resid-builder.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid-builder.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid-builder.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resid-builder.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid-builder.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid-builder.cpp
wave8580_PS_.lo: sidplay-libs/resid/wave8580_PS_.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_PS_.lo -MD -MP -MF $(DEPDIR)/wave8580_PS_.Tpo -c -o wave8580_PS_.lo `test -f 'sidplay-libs/resid/wave8580_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PS_.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/wave8580_PS_.Tpo $(DEPDIR)/wave8580_PS_.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/wave8580_PS_.cpp' object='wave8580_PS_.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_PS_.lo -MD -MP -MF $(DEPDIR)/wave8580_PS_.Tpo -c -o wave8580_PS_.lo `test -f 'sidplay-libs/resid/wave8580_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PS_.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wave8580_PS_.Tpo $(DEPDIR)/wave8580_PS_.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/wave8580_PS_.cpp' object='wave8580_PS_.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_PS_.lo `test -f 'sidplay-libs/resid/wave8580_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PS_.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_PS_.lo `test -f 'sidplay-libs/resid/wave8580_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PS_.cpp
filter.lo: sidplay-libs/resid/filter.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filter.lo -MD -MP -MF $(DEPDIR)/filter.Tpo -c -o filter.lo `test -f 'sidplay-libs/resid/filter.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/filter.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/filter.Tpo $(DEPDIR)/filter.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/filter.cpp' object='filter.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filter.lo -MD -MP -MF $(DEPDIR)/filter.Tpo -c -o filter.lo `test -f 'sidplay-libs/resid/filter.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/filter.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/filter.Tpo $(DEPDIR)/filter.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/filter.cpp' object='filter.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filter.lo `test -f 'sidplay-libs/resid/filter.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/filter.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filter.lo `test -f 'sidplay-libs/resid/filter.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/filter.cpp
pot.lo: sidplay-libs/resid/pot.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pot.lo -MD -MP -MF $(DEPDIR)/pot.Tpo -c -o pot.lo `test -f 'sidplay-libs/resid/pot.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/pot.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/pot.Tpo $(DEPDIR)/pot.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/pot.cpp' object='pot.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pot.lo -MD -MP -MF $(DEPDIR)/pot.Tpo -c -o pot.lo `test -f 'sidplay-libs/resid/pot.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/pot.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pot.Tpo $(DEPDIR)/pot.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/pot.cpp' object='pot.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pot.lo `test -f 'sidplay-libs/resid/pot.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/pot.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pot.lo `test -f 'sidplay-libs/resid/pot.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/pot.cpp
wave.lo: sidplay-libs/resid/wave.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave.lo -MD -MP -MF $(DEPDIR)/wave.Tpo -c -o wave.lo `test -f 'sidplay-libs/resid/wave.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/wave.Tpo $(DEPDIR)/wave.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/wave.cpp' object='wave.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave.lo -MD -MP -MF $(DEPDIR)/wave.Tpo -c -o wave.lo `test -f 'sidplay-libs/resid/wave.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wave.Tpo $(DEPDIR)/wave.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/wave.cpp' object='wave.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave.lo `test -f 'sidplay-libs/resid/wave.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave.lo `test -f 'sidplay-libs/resid/wave.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave.cpp
version.lo: sidplay-libs/resid/version.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT version.lo -MD -MP -MF $(DEPDIR)/version.Tpo -c -o version.lo `test -f 'sidplay-libs/resid/version.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/version.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/version.Tpo $(DEPDIR)/version.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/version.cpp' object='version.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT version.lo -MD -MP -MF $(DEPDIR)/version.Tpo -c -o version.lo `test -f 'sidplay-libs/resid/version.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/version.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/version.Tpo $(DEPDIR)/version.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/version.cpp' object='version.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o version.lo `test -f 'sidplay-libs/resid/version.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/version.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o version.lo `test -f 'sidplay-libs/resid/version.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/version.cpp
wave6581__ST.lo: sidplay-libs/resid/wave6581__ST.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581__ST.lo -MD -MP -MF $(DEPDIR)/wave6581__ST.Tpo -c -o wave6581__ST.lo `test -f 'sidplay-libs/resid/wave6581__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581__ST.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/wave6581__ST.Tpo $(DEPDIR)/wave6581__ST.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/wave6581__ST.cpp' object='wave6581__ST.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581__ST.lo -MD -MP -MF $(DEPDIR)/wave6581__ST.Tpo -c -o wave6581__ST.lo `test -f 'sidplay-libs/resid/wave6581__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581__ST.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wave6581__ST.Tpo $(DEPDIR)/wave6581__ST.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/wave6581__ST.cpp' object='wave6581__ST.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581__ST.lo `test -f 'sidplay-libs/resid/wave6581__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581__ST.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581__ST.lo `test -f 'sidplay-libs/resid/wave6581__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581__ST.cpp
extfilt.lo: sidplay-libs/resid/extfilt.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT extfilt.lo -MD -MP -MF $(DEPDIR)/extfilt.Tpo -c -o extfilt.lo `test -f 'sidplay-libs/resid/extfilt.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/extfilt.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/extfilt.Tpo $(DEPDIR)/extfilt.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/extfilt.cpp' object='extfilt.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT extfilt.lo -MD -MP -MF $(DEPDIR)/extfilt.Tpo -c -o extfilt.lo `test -f 'sidplay-libs/resid/extfilt.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/extfilt.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/extfilt.Tpo $(DEPDIR)/extfilt.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/extfilt.cpp' object='extfilt.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o extfilt.lo `test -f 'sidplay-libs/resid/extfilt.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/extfilt.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o extfilt.lo `test -f 'sidplay-libs/resid/extfilt.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/extfilt.cpp
wave8580_PST.lo: sidplay-libs/resid/wave8580_PST.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_PST.lo -MD -MP -MF $(DEPDIR)/wave8580_PST.Tpo -c -o wave8580_PST.lo `test -f 'sidplay-libs/resid/wave8580_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PST.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/wave8580_PST.Tpo $(DEPDIR)/wave8580_PST.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/wave8580_PST.cpp' object='wave8580_PST.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_PST.lo -MD -MP -MF $(DEPDIR)/wave8580_PST.Tpo -c -o wave8580_PST.lo `test -f 'sidplay-libs/resid/wave8580_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PST.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wave8580_PST.Tpo $(DEPDIR)/wave8580_PST.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/wave8580_PST.cpp' object='wave8580_PST.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_PST.lo `test -f 'sidplay-libs/resid/wave8580_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PST.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_PST.lo `test -f 'sidplay-libs/resid/wave8580_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PST.cpp
wave6581_PST.lo: sidplay-libs/resid/wave6581_PST.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_PST.lo -MD -MP -MF $(DEPDIR)/wave6581_PST.Tpo -c -o wave6581_PST.lo `test -f 'sidplay-libs/resid/wave6581_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PST.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/wave6581_PST.Tpo $(DEPDIR)/wave6581_PST.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/wave6581_PST.cpp' object='wave6581_PST.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_PST.lo -MD -MP -MF $(DEPDIR)/wave6581_PST.Tpo -c -o wave6581_PST.lo `test -f 'sidplay-libs/resid/wave6581_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PST.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wave6581_PST.Tpo $(DEPDIR)/wave6581_PST.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/wave6581_PST.cpp' object='wave6581_PST.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_PST.lo `test -f 'sidplay-libs/resid/wave6581_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PST.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_PST.lo `test -f 'sidplay-libs/resid/wave6581_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PST.cpp
wave6581_P_T.lo: sidplay-libs/resid/wave6581_P_T.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_P_T.lo -MD -MP -MF $(DEPDIR)/wave6581_P_T.Tpo -c -o wave6581_P_T.lo `test -f 'sidplay-libs/resid/wave6581_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_P_T.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/wave6581_P_T.Tpo $(DEPDIR)/wave6581_P_T.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/wave6581_P_T.cpp' object='wave6581_P_T.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_P_T.lo -MD -MP -MF $(DEPDIR)/wave6581_P_T.Tpo -c -o wave6581_P_T.lo `test -f 'sidplay-libs/resid/wave6581_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_P_T.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wave6581_P_T.Tpo $(DEPDIR)/wave6581_P_T.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/wave6581_P_T.cpp' object='wave6581_P_T.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_P_T.lo `test -f 'sidplay-libs/resid/wave6581_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_P_T.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_P_T.lo `test -f 'sidplay-libs/resid/wave6581_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_P_T.cpp
wave6581_PS_.lo: sidplay-libs/resid/wave6581_PS_.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_PS_.lo -MD -MP -MF $(DEPDIR)/wave6581_PS_.Tpo -c -o wave6581_PS_.lo `test -f 'sidplay-libs/resid/wave6581_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PS_.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/wave6581_PS_.Tpo $(DEPDIR)/wave6581_PS_.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/wave6581_PS_.cpp' object='wave6581_PS_.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_PS_.lo -MD -MP -MF $(DEPDIR)/wave6581_PS_.Tpo -c -o wave6581_PS_.lo `test -f 'sidplay-libs/resid/wave6581_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PS_.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wave6581_PS_.Tpo $(DEPDIR)/wave6581_PS_.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/wave6581_PS_.cpp' object='wave6581_PS_.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_PS_.lo `test -f 'sidplay-libs/resid/wave6581_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PS_.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_PS_.lo `test -f 'sidplay-libs/resid/wave6581_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PS_.cpp
envelope.lo: sidplay-libs/resid/envelope.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT envelope.lo -MD -MP -MF $(DEPDIR)/envelope.Tpo -c -o envelope.lo `test -f 'sidplay-libs/resid/envelope.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/envelope.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/envelope.Tpo $(DEPDIR)/envelope.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/envelope.cpp' object='envelope.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT envelope.lo -MD -MP -MF $(DEPDIR)/envelope.Tpo -c -o envelope.lo `test -f 'sidplay-libs/resid/envelope.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/envelope.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/envelope.Tpo $(DEPDIR)/envelope.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/envelope.cpp' object='envelope.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o envelope.lo `test -f 'sidplay-libs/resid/envelope.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/envelope.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o envelope.lo `test -f 'sidplay-libs/resid/envelope.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/envelope.cpp
voice.lo: sidplay-libs/resid/voice.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT voice.lo -MD -MP -MF $(DEPDIR)/voice.Tpo -c -o voice.lo `test -f 'sidplay-libs/resid/voice.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/voice.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/voice.Tpo $(DEPDIR)/voice.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/voice.cpp' object='voice.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT voice.lo -MD -MP -MF $(DEPDIR)/voice.Tpo -c -o voice.lo `test -f 'sidplay-libs/resid/voice.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/voice.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/voice.Tpo $(DEPDIR)/voice.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/voice.cpp' object='voice.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o voice.lo `test -f 'sidplay-libs/resid/voice.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/voice.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o voice.lo `test -f 'sidplay-libs/resid/voice.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/voice.cpp
sid.lo: sidplay-libs/resid/sid.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sid.lo -MD -MP -MF $(DEPDIR)/sid.Tpo -c -o sid.lo `test -f 'sidplay-libs/resid/sid.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/sid.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/sid.Tpo $(DEPDIR)/sid.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/sid.cpp' object='sid.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sid.lo -MD -MP -MF $(DEPDIR)/sid.Tpo -c -o sid.lo `test -f 'sidplay-libs/resid/sid.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/sid.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sid.Tpo $(DEPDIR)/sid.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/sid.cpp' object='sid.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sid.lo `test -f 'sidplay-libs/resid/sid.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/sid.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sid.lo `test -f 'sidplay-libs/resid/sid.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/sid.cpp
wave8580__ST.lo: sidplay-libs/resid/wave8580__ST.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580__ST.lo -MD -MP -MF $(DEPDIR)/wave8580__ST.Tpo -c -o wave8580__ST.lo `test -f 'sidplay-libs/resid/wave8580__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580__ST.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/wave8580__ST.Tpo $(DEPDIR)/wave8580__ST.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/wave8580__ST.cpp' object='wave8580__ST.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580__ST.lo -MD -MP -MF $(DEPDIR)/wave8580__ST.Tpo -c -o wave8580__ST.lo `test -f 'sidplay-libs/resid/wave8580__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580__ST.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wave8580__ST.Tpo $(DEPDIR)/wave8580__ST.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/wave8580__ST.cpp' object='wave8580__ST.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580__ST.lo `test -f 'sidplay-libs/resid/wave8580__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580__ST.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580__ST.lo `test -f 'sidplay-libs/resid/wave8580__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580__ST.cpp
wave8580_P_T.lo: sidplay-libs/resid/wave8580_P_T.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_P_T.lo -MD -MP -MF $(DEPDIR)/wave8580_P_T.Tpo -c -o wave8580_P_T.lo `test -f 'sidplay-libs/resid/wave8580_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_P_T.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/wave8580_P_T.Tpo $(DEPDIR)/wave8580_P_T.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sidplay-libs/resid/wave8580_P_T.cpp' object='wave8580_P_T.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_P_T.lo -MD -MP -MF $(DEPDIR)/wave8580_P_T.Tpo -c -o wave8580_P_T.lo `test -f 'sidplay-libs/resid/wave8580_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_P_T.cpp
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wave8580_P_T.Tpo $(DEPDIR)/wave8580_P_T.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='sidplay-libs/resid/wave8580_P_T.cpp' object='wave8580_P_T.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_P_T.lo `test -f 'sidplay-libs/resid/wave8580_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_P_T.cpp
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_P_T.lo `test -f 'sidplay-libs/resid/wave8580_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_P_T.cpp
mostlyclean-libtool:
-rm -f *.lo
@@@ -1013,26 -1109,15 +1136,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -1044,15 -1129,11 +1156,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -1061,6 -1142,21 +1169,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -1205,19 -1301,20 +1328,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/sndfile/Makefile.in
index 3e35a7a,df6aaa8..c54517d
--- a/plugins/sndfile/Makefile.in
+++ b/plugins/sndfile/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/sndfile
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -114,23 -142,48 +166,48 @@@ am__DEPENDENCIES_1
am__sndfile_la_SOURCES_DIST = sndfile.c
@HAVE_SNDFILE_TRUE at am_sndfile_la_OBJECTS = sndfile.lo
sndfile_la_OBJECTS = $(am_sndfile_la_OBJECTS)
- sndfile_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ sndfile_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(sndfile_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_SNDFILE_TRUE at am_sndfile_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(sndfile_la_SOURCES)
DIST_SOURCES = $(am__sndfile_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -191,23 +215,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -234,7 +261,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -255,12 +282,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -283,7 +310,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -337,7 +364,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -356,8 +383,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -383,17 +410,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -402,9 +429,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,9 -465,9 +492,9 @@@ top_srcdir = @top_srcdir
@HAVE_SNDFILE_TRUE at sndfiledir = $(libdir)/$(PACKAGE)
@HAVE_SNDFILE_TRUE at pkglib_LTLIBRARIES = sndfile.la
@HAVE_SNDFILE_TRUE at sndfile_la_SOURCES = sndfile.c
- @HAVE_SNDFILE_TRUE at sndfile_la_LDFLAGS = -module
+ @HAVE_SNDFILE_TRUE at sndfile_la_LDFLAGS = -module -avoid-version
@HAVE_SNDFILE_TRUE at sndfile_la_LIBADD = $(LDADD) $(SNDFILE_LIBS)
- @HAVE_SNDFILE_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
+ @HAVE_SNDFILE_TRUE at AM_CFLAGS = $(CFLAGS) $(WAVPACK_CFLAGS) -std=c99
all: all-am
.SUFFIXES:
@@@ -419,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
sndfile.la: $(sndfile_la_OBJECTS) $(sndfile_la_DEPENDENCIES) $(EXTRA_sndfile_la_DEPENDENCIES)
- $(sndfile_la_LINK) $(am_sndfile_la_rpath) $(sndfile_la_OBJECTS) $(sndfile_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(sndfile_la_LINK) $(am_sndfile_la_rpath) $(sndfile_la_OBJECTS) $(sndfile_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sndfile.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/supereq/Makefile.in
index 7acfbb1,4034244..1ca35cb
--- a/plugins/supereq/Makefile.in
+++ b/plugins/supereq/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/supereq
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -115,32 -143,66 +167,66 @@@ am__supereq_la_SOURCES_DIST = supereq.
@HAVE_SUPEREQ_TRUE at am_supereq_la_OBJECTS = supereq.lo Equ.lo \
@HAVE_SUPEREQ_TRUE@ Fftsg_fl.lo
supereq_la_OBJECTS = $(am_supereq_la_OBJECTS)
- supereq_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ supereq_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(supereq_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_SUPEREQ_TRUE at am_supereq_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+ AM_V_CXX = $(am__v_CXX_ at AM_V@)
+ am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+ am__v_CXX_0 = @echo " CXX " $@;
+ am__v_CXX_1 =
CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+ am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+ am__v_CXXLD_0 = @echo " CXXLD " $@;
+ am__v_CXXLD_1 =
SOURCES = $(supereq_la_SOURCES)
DIST_SOURCES = $(am__supereq_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -148,6 -210,23 +234,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -174,6 -253,7 +280,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -194,10 -274,12 +301,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -220,6 -302,7 +329,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -273,6 -356,7 +383,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -291,6 -375,8 +402,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -316,13 -402,17 +429,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -331,7 -421,9 +448,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -393,8 -485,8 +512,8 @@@ top_srcdir = @top_srcdir
@HAVE_SUPEREQ_TRUE at pkglib_LTLIBRARIES = supereq.la
@HAVE_SUPEREQ_TRUE at supereq_la_SOURCES = supereq.c Equ.cpp Equ.h Fftsg_fl.c paramlist.hpp
@HAVE_SUPEREQ_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_OOURA
- @HAVE_SUPEREQ_TRUE at AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -nostdlib -fno-unwind-tables -DUSE_OOURA
- @HAVE_SUPEREQ_TRUE at supereq_la_LDFLAGS = -module $(NOCPPLIB)
+ @HAVE_SUPEREQ_TRUE at AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fno-unwind-tables -DUSE_OOURA
+ @HAVE_SUPEREQ_TRUE at supereq_la_LDFLAGS = -module -avoid-version $(NOCPPLIB)
@HAVE_SUPEREQ_TRUE at supereq_la_LIBADD = $(LDADD)
all: all-am
@@@ -430,6 -522,7 +549,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -456,14 -549,17 +576,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
supereq.la: $(supereq_la_OBJECTS) $(supereq_la_DEPENDENCIES) $(EXTRA_supereq_la_DEPENDENCIES)
- $(supereq_la_LINK) $(am_supereq_la_rpath) $(supereq_la_OBJECTS) $(supereq_la_LIBADD) $(LIBS)
+ $(AM_V_CXXLD)$(supereq_la_LINK) $(am_supereq_la_rpath) $(supereq_la_OBJECTS) $(supereq_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -476,46 -572,46 +599,46 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/supereq.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
.cpp.o:
- @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
.cpp.obj:
- @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cpp.lo:
- @am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+ @am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -523,26 -619,15 +646,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -554,15 -639,11 +666,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -571,6 -652,21 +679,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -715,19 -811,20 +838,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/tta/Makefile.in
index adf5ae7,279c500..95f6b9d
--- a/plugins/tta/Makefile.in
+++ b/plugins/tta/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/tta
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -113,23 -141,48 +165,48 @@@ tta_la_LIBADD
am__tta_la_SOURCES_DIST = ttaplug.c filter.h ttadec.c ttadec.h
@HAVE_TTA_TRUE at am_tta_la_OBJECTS = ttaplug.lo ttadec.lo
tta_la_OBJECTS = $(am_tta_la_OBJECTS)
- tta_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(tta_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ tta_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(tta_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_TTA_TRUE at am_tta_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(tta_la_SOURCES)
DIST_SOURCES = $(am__tta_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -137,6 -190,23 +214,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -163,6 -233,7 +260,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -183,10 -254,12 +281,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -209,6 -282,7 +309,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -262,6 -336,7 +363,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -280,6 -355,8 +382,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -305,13 -382,17 +409,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -320,7 -401,9 +428,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,7 -465,7 +492,7 @@@ top_srcdir = @top_srcdir
@HAVE_TTA_TRUE at EXTRA_DIST = $(ttapath)/README
@HAVE_TTA_TRUE at pkglib_LTLIBRARIES = tta.la
@HAVE_TTA_TRUE at tta_la_SOURCES = ttaplug.c filter.h ttadec.c ttadec.h
- @HAVE_TTA_TRUE at tta_la_LDFLAGS = -module
+ @HAVE_TTA_TRUE at tta_la_LDFLAGS = -module -avoid-version
@HAVE_TTA_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
all: all-am
@@@ -418,6 -501,7 +528,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -444,14 -528,17 +555,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
tta.la: $(tta_la_OBJECTS) $(tta_la_DEPENDENCIES) $(EXTRA_tta_la_DEPENDENCIES)
- $(tta_la_LINK) $(am_tta_la_rpath) $(tta_la_OBJECTS) $(tta_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(tta_la_LINK) $(am_tta_la_rpath) $(tta_la_OBJECTS) $(tta_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ttaplug.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/vfs_curl/Makefile.in
index 6a20de0,72d38e7..8ce81c5
--- a/plugins/vfs_curl/Makefile.in
+++ b/plugins/vfs_curl/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/vfs_curl
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -114,23 -142,48 +166,48 @@@ am__DEPENDENCIES_1
am__vfs_curl_la_SOURCES_DIST = vfs_curl.c
@HAVE_VFS_CURL_TRUE at am_vfs_curl_la_OBJECTS = vfs_curl.lo
vfs_curl_la_OBJECTS = $(am_vfs_curl_la_OBJECTS)
- vfs_curl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ vfs_curl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(vfs_curl_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_VFS_CURL_TRUE at am_vfs_curl_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(vfs_curl_la_SOURCES)
DIST_SOURCES = $(am__vfs_curl_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -191,23 +215,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -234,7 +261,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -255,12 +282,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -283,7 +310,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -337,7 +364,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -356,8 +383,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -383,17 +410,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -402,9 +429,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,9 -465,9 +492,9 @@@ top_srcdir = @top_srcdir
@HAVE_VFS_CURL_TRUE at vfs_curldir = $(libdir)/$(PACKAGE)
@HAVE_VFS_CURL_TRUE at pkglib_LTLIBRARIES = vfs_curl.la
@HAVE_VFS_CURL_TRUE at vfs_curl_la_SOURCES = vfs_curl.c
- @HAVE_VFS_CURL_TRUE at vfs_curl_la_LDFLAGS = -module
+ @HAVE_VFS_CURL_TRUE at vfs_curl_la_LDFLAGS = -module -avoid-version
@HAVE_VFS_CURL_TRUE at vfs_curl_la_LIBADD = $(LDADD) $(VFS_CURL_LIBS)
- @HAVE_VFS_CURL_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
+ @HAVE_VFS_CURL_TRUE at AM_CFLAGS = $(CFLAGS) $(VFS_CURL_CFLAGS) -std=c99
all: all-am
.SUFFIXES:
@@@ -419,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
vfs_curl.la: $(vfs_curl_la_OBJECTS) $(vfs_curl_la_DEPENDENCIES) $(EXTRA_vfs_curl_la_DEPENDENCIES)
- $(vfs_curl_la_LINK) $(am_vfs_curl_la_rpath) $(vfs_curl_la_OBJECTS) $(vfs_curl_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(vfs_curl_la_LINK) $(am_vfs_curl_la_rpath) $(vfs_curl_la_OBJECTS) $(vfs_curl_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vfs_curl.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/vfs_zip/Makefile.in
index 27ea107,139b577..a20941b
--- a/plugins/vfs_zip/Makefile.in
+++ b/plugins/vfs_zip/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/vfs_zip
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -115,23 -143,48 +167,48 @@@ am__DEPENDENCIES_1
am__vfs_zip_la_SOURCES_DIST = vfs_zip.c
@HAVE_VFS_ZIP_TRUE at am_vfs_zip_la_OBJECTS = vfs_zip.lo
vfs_zip_la_OBJECTS = $(am_vfs_zip_la_OBJECTS)
- vfs_zip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ vfs_zip_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(vfs_zip_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_VFS_ZIP_TRUE at am_vfs_zip_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(vfs_zip_la_SOURCES)
DIST_SOURCES = $(am__vfs_zip_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -139,6 -192,23 +216,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -165,6 -235,7 +262,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -185,10 -256,12 +283,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -211,6 -284,7 +311,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -264,6 -338,7 +365,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -282,6 -357,8 +384,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -307,13 -384,17 +411,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -322,7 -403,9 +430,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,9 -465,9 +492,9 @@@ top_builddir = @top_builddir
top_srcdir = @top_srcdir@
@HAVE_VFS_ZIP_TRUE at pkglib_LTLIBRARIES = vfs_zip.la
@HAVE_VFS_ZIP_TRUE at vfs_zip_la_SOURCES = vfs_zip.c
- @HAVE_VFS_ZIP_TRUE at vfs_zip_la_LDFLAGS = -module
+ @HAVE_VFS_ZIP_TRUE at vfs_zip_la_LDFLAGS = -module -avoid-version
@HAVE_VFS_ZIP_TRUE at vfs_zip_la_LIBADD = $(LDADD) $(ZLIB_LIBS) $(ZIP_LIBS)
- @HAVE_VFS_ZIP_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
+ @HAVE_VFS_ZIP_TRUE at AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) $(ZIP_CFLAGS) -std=c99
all: all-am
.SUFFIXES:
@@@ -419,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
vfs_zip.la: $(vfs_zip_la_OBJECTS) $(vfs_zip_la_DEPENDENCIES) $(EXTRA_vfs_zip_la_DEPENDENCIES)
- $(vfs_zip_la_LINK) $(am_vfs_zip_la_rpath) $(vfs_zip_la_OBJECTS) $(vfs_zip_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(vfs_zip_la_LINK) $(am_vfs_zip_la_rpath) $(vfs_zip_la_OBJECTS) $(vfs_zip_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vfs_zip.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/vorbis/Makefile.in
index 368bd2c,a89237a..e16e3b4
--- a/plugins/vorbis/Makefile.in
+++ b/plugins/vorbis/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/vorbis
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -110,28 -138,53 +162,53 @@@ am__uninstall_files_from_dir = {
am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
am__DEPENDENCIES_1 =
- @HAVE_VORBIS_TRUE at vorbis_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am__vorbis_la_SOURCES_DIST = vorbis.c vcedit.c vcedit.h vceditaux.h \
- i18n.h
- @HAVE_VORBIS_TRUE at am_vorbis_la_OBJECTS = vorbis.lo vcedit.lo
+ @HAVE_VORBIS_TRUE at vorbis_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ @HAVE_VORBIS_TRUE@ ../liboggedit/liboggedit.a
+ am__vorbis_la_SOURCES_DIST = vorbis.c
+ @HAVE_VORBIS_TRUE at am_vorbis_la_OBJECTS = vorbis.lo
vorbis_la_OBJECTS = $(am_vorbis_la_OBJECTS)
- vorbis_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ vorbis_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(vorbis_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_VORBIS_TRUE at am_vorbis_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(vorbis_la_SOURCES)
DIST_SOURCES = $(am__vorbis_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -139,6 -192,23 +216,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -165,6 -235,7 +262,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -185,10 -256,12 +283,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -211,6 -284,7 +311,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -264,6 -338,7 +365,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -282,6 -357,8 +384,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -307,13 -384,17 +411,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -322,7 -403,9 +430,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,10 -465,10 +492,10 @@@ top_builddir = @top_builddir
top_srcdir = @top_srcdir@
@HAVE_VORBIS_TRUE at vorbisdir = $(libdir)/$(PACKAGE)
@HAVE_VORBIS_TRUE at pkglib_LTLIBRARIES = vorbis.la
- @HAVE_VORBIS_TRUE at vorbis_la_SOURCES = vorbis.c vcedit.c vcedit.h vceditaux.h i18n.h
- @HAVE_VORBIS_TRUE at vorbis_la_LDFLAGS = -module
- @HAVE_VORBIS_TRUE at vorbis_la_LIBADD = $(LDADD) $(VORBIS_LIBS) -lc
- @HAVE_VORBIS_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
+ @HAVE_VORBIS_TRUE at vorbis_la_SOURCES = vorbis.c
+ @HAVE_VORBIS_TRUE at vorbis_la_LDFLAGS = -module -avoid-version -lm -export-symbols-regex vorbis_load
+ @HAVE_VORBIS_TRUE at vorbis_la_LIBADD = $(LDADD) $(VORBIS_LIBS) ../liboggedit/liboggedit.a
+ @HAVE_VORBIS_TRUE at AM_CFLAGS = $(CFLAGS) $(VORBIS_CFLAGS) -std=c99
all: all-am
.SUFFIXES:
@@@ -420,6 -503,7 +530,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -446,14 -530,17 +557,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
vorbis.la: $(vorbis_la_OBJECTS) $(vorbis_la_DEPENDENCIES) $(EXTRA_vorbis_la_DEPENDENCIES)
- $(vorbis_la_LINK) $(am_vorbis_la_rpath) $(vorbis_la_OBJECTS) $(vorbis_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(vorbis_la_LINK) $(am_vorbis_la_rpath) $(vorbis_la_OBJECTS) $(vorbis_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -461,29 -548,28 +575,28 @@@
distclean-compile:
-rm -f *.tab.c
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vcedit.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vorbis.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -491,26 -577,15 +604,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -522,15 -597,11 +624,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -539,6 -610,21 +637,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -683,19 -769,20 +796,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/vtx/Makefile.in
index 846c9a2,a3df1a6..83b00a2
--- a/plugins/vtx/Makefile.in
+++ b/plugins/vtx/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/vtx
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -115,23 -143,48 +167,48 @@@ am__vtx_la_SOURCES_DIST = vtx.c ay8912.
@HAVE_VTX_TRUE at am_vtx_la_OBJECTS = vtx.lo ay8912.lo lh5dec.lo \
@HAVE_VTX_TRUE@ vtxfile.lo
vtx_la_OBJECTS = $(am_vtx_la_OBJECTS)
- vtx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(vtx_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ vtx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(vtx_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_VTX_TRUE at am_vtx_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(vtx_la_SOURCES)
DIST_SOURCES = $(am__vtx_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -139,6 -192,23 +216,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -165,6 -235,7 +262,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -185,10 -256,12 +283,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -211,6 -284,7 +311,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -264,6 -338,7 +365,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -282,6 -357,8 +384,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -307,13 -384,17 +411,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -322,7 -403,9 +430,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -383,7 -466,7 +493,7 @@@ top_srcdir = @top_srcdir
@HAVE_VTX_TRUE at vtxdir = $(libdir)/$(PACKAGE)
@HAVE_VTX_TRUE at pkglib_LTLIBRARIES = vtx.la
@HAVE_VTX_TRUE at vtx_la_SOURCES = vtx.c ay8912.c ayemu_8912.h ayemu.h ayemu_vtxfile.h lh5dec.c vtxfile.c
- @HAVE_VTX_TRUE at vtx_la_LDFLAGS = -module
+ @HAVE_VTX_TRUE at vtx_la_LDFLAGS = -module -avoid-version
@HAVE_VTX_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
all: all-am
@@@ -419,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
vtx.la: $(vtx_la_OBJECTS) $(vtx_la_DEPENDENCIES) $(EXTRA_vtx_la_DEPENDENCIES)
- $(vtx_la_LINK) $(am_vtx_la_rpath) $(vtx_la_OBJECTS) $(vtx_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(vtx_la_LINK) $(am_vtx_la_rpath) $(vtx_la_OBJECTS) $(vtx_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -466,25 -553,25 +580,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vtxfile.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -492,26 -579,15 +606,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -523,15 -599,11 +626,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -540,6 -612,21 +639,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -684,19 -771,20 +798,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/wavpack/Makefile.in
index cdbfbef,9c27c7b..5a51f33
--- a/plugins/wavpack/Makefile.in
+++ b/plugins/wavpack/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/wavpack
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -114,23 -142,48 +166,48 @@@ am__DEPENDENCIES_1
am__wavpack_la_SOURCES_DIST = wavpack.c
@HAVE_WAVPACK_TRUE at am_wavpack_la_OBJECTS = wavpack.lo
wavpack_la_OBJECTS = $(am_wavpack_la_OBJECTS)
- wavpack_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ wavpack_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(wavpack_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_WAVPACK_TRUE at am_wavpack_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(wavpack_la_SOURCES)
DIST_SOURCES = $(am__wavpack_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -138,6 -191,23 +215,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -164,6 -234,7 +261,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -184,10 -255,12 +282,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -210,6 -283,7 +310,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -263,6 -337,7 +364,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -281,6 -356,8 +383,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -306,13 -383,17 +410,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -321,7 -402,9 +429,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -382,9 -465,9 +492,9 @@@ top_srcdir = @top_srcdir
@HAVE_WAVPACK_TRUE at wavpackdir = $(libdir)/$(PACKAGE)
@HAVE_WAVPACK_TRUE at pkglib_LTLIBRARIES = wavpack.la
@HAVE_WAVPACK_TRUE at wavpack_la_SOURCES = wavpack.c
- @HAVE_WAVPACK_TRUE at wavpack_la_LDFLAGS = -module
+ @HAVE_WAVPACK_TRUE at wavpack_la_LDFLAGS = -module -avoid-version
@HAVE_WAVPACK_TRUE at wavpack_la_LIBADD = $(LDADD) $(WAVPACK_LIBS)
- @HAVE_WAVPACK_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99
+ @HAVE_WAVPACK_TRUE at AM_CFLAGS = $(CFLAGS) $(WAVPACK_CFLAGS) -std=c99
all: all-am
.SUFFIXES:
@@@ -419,6 -502,7 +529,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -445,14 -529,17 +556,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
wavpack.la: $(wavpack_la_OBJECTS) $(wavpack_la_DEPENDENCIES) $(EXTRA_wavpack_la_DEPENDENCIES)
- $(wavpack_la_LINK) $(am_wavpack_la_rpath) $(wavpack_la_OBJECTS) $(wavpack_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(wavpack_la_LINK) $(am_wavpack_la_rpath) $(wavpack_la_OBJECTS) $(wavpack_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -463,25 -550,25 +577,25 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wavpack.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@@ -489,26 -576,15 +603,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -520,15 -596,11 +623,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -537,6 -609,21 +636,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -681,19 -768,20 +795,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/wildmidi/Makefile.in
index 4b8f71a,fda5045..b9b51d2
--- a/plugins/wildmidi/Makefile.in
+++ b/plugins/wildmidi/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,8 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/wildmidi
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- COPYING
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -116,23 -143,48 +167,48 @@@ am__wildmidi_la_SOURCES_DIST = wildmidi
@HAVE_WILDMIDI_TRUE at am_wildmidi_la_OBJECTS = wildmidiplug.lo \
@HAVE_WILDMIDI_TRUE@ wildmidi_lib.lo
wildmidi_la_OBJECTS = $(am_wildmidi_la_OBJECTS)
- wildmidi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ wildmidi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(wildmidi_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_WILDMIDI_TRUE at am_wildmidi_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(wildmidi_la_SOURCES)
DIST_SOURCES = $(am__wildmidi_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -140,6 -192,23 +216,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -166,6 -235,7 +262,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -186,10 -256,12 +283,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -212,6 -284,7 +311,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -265,6 -338,7 +365,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -283,6 -357,8 +384,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -308,13 -384,17 +411,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -323,7 -403,9 +430,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -385,7 -467,7 +494,7 @@@ top_srcdir = @top_srcdir
@HAVE_WILDMIDI_TRUE at EXTRA_DIST = $(wildmidipath)/README
@HAVE_WILDMIDI_TRUE at pkglib_LTLIBRARIES = wildmidi.la
@HAVE_WILDMIDI_TRUE at wildmidi_la_SOURCES = wildmidiplug.c src/wildmidi_lib.c include/wildmidi_lib.h
- @HAVE_WILDMIDI_TRUE at wildmidi_la_LDFLAGS = -module
+ @HAVE_WILDMIDI_TRUE at wildmidi_la_LDFLAGS = -module -avoid-version
@HAVE_WILDMIDI_TRUE at wildmidi_la_LIBADD = -lm
@HAVE_WILDMIDI_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -I$(wildmidipath)/include -DWILDMIDI_VERSION=\"0.2.2\" -DWILDMIDILIB_VERSION=\"0.2.2\" -DTIMIDITY_CFG=\"/etc/timidity.conf\" -fPIC
all: all-am
@@@ -422,6 -504,7 +531,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -448,14 -531,17 +558,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
wildmidi.la: $(wildmidi_la_OBJECTS) $(wildmidi_la_DEPENDENCIES) $(EXTRA_wildmidi_la_DEPENDENCIES)
- $(wildmidi_la_LINK) $(am_wildmidi_la_rpath) $(wildmidi_la_OBJECTS) $(wildmidi_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(wildmidi_la_LINK) $(am_wildmidi_la_rpath) $(wildmidi_la_OBJECTS) $(wildmidi_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -467,32 -553,32 +580,32 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wildmidiplug.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
wildmidi_lib.lo: src/wildmidi_lib.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wildmidi_lib.lo -MD -MP -MF $(DEPDIR)/wildmidi_lib.Tpo -c -o wildmidi_lib.lo `test -f 'src/wildmidi_lib.c' || echo '$(srcdir)/'`src/wildmidi_lib.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/wildmidi_lib.Tpo $(DEPDIR)/wildmidi_lib.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/wildmidi_lib.c' object='wildmidi_lib.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wildmidi_lib.lo -MD -MP -MF $(DEPDIR)/wildmidi_lib.Tpo -c -o wildmidi_lib.lo `test -f 'src/wildmidi_lib.c' || echo '$(srcdir)/'`src/wildmidi_lib.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wildmidi_lib.Tpo $(DEPDIR)/wildmidi_lib.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/wildmidi_lib.c' object='wildmidi_lib.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wildmidi_lib.lo `test -f 'src/wildmidi_lib.c' || echo '$(srcdir)/'`src/wildmidi_lib.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wildmidi_lib.lo `test -f 'src/wildmidi_lib.c' || echo '$(srcdir)/'`src/wildmidi_lib.c
mostlyclean-libtool:
-rm -f *.lo
@@@ -500,26 -586,15 +613,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -531,15 -606,11 +633,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -548,6 -619,21 +646,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -692,19 -778,20 +805,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined plugins/wma/Makefile.in
index d33c936,6744256..c833f9c
--- a/plugins/wma/Makefile.in
+++ b/plugins/wma/Makefile.in
@@@ -1,9 -1,8 +1,12 @@@
++<<<<<<< HEAD
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
++=======
+ # Makefile.in generated by automake 1.14.1 from Makefile.am.
++>>>>>>> upstream/0.6.2
# @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- # Foundation, Inc.
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@@ -16,23 -15,51 +19,71 @@@
@SET_MAKE@
VPATH = @srcdir@
++<<<<<<< HEAD
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
++=======
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++>>>>>>> upstream/0.6.2
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@@ -52,7 -79,8 +103,8 @@@ POST_UNINSTALL =
build_triplet = @build@
host_triplet = @host@
subdir = plugins/wma
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
@@@ -122,23 -150,48 +174,48 @@@ am__wma_la_SOURCES_DIST = wma_plugin.c
@HAVE_WMA_TRUE@ wmafixed.lo wmadeci.lo fft-ffmpeg.lo \
@HAVE_WMA_TRUE@ mdct_lookup.lo mdct.lo ffmpeg_bitstream.lo
wma_la_OBJECTS = $(am_wma_la_OBJECTS)
- wma_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(wma_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ wma_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(wma_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_WMA_TRUE at am_wma_la_rpath = -rpath $(pkglibdir)
+ AM_V_P = $(am__v_P_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_ at AM_V@)
+ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo " GEN " $@;
+ am__v_GEN_1 =
+ AM_V_at = $(am__v_at_ at AM_V@)
+ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+ am__v_CC_0 = @echo " CC " $@;
+ am__v_CC_1 =
CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo " CCLD " $@;
+ am__v_CCLD_1 =
SOURCES = $(wma_la_SOURCES)
DIST_SOURCES = $(am__wma_la_SOURCES_DIST)
am__can_run_installinfo = \
@@@ -146,6 -199,23 +223,26 @@@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
++<<<<<<< HEAD
++=======
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates. Input order is
+ # *not* preserved.
+ am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+ '
+ # Make sure the list of sources is unique. This is necessary because,
+ # e.g., the same source file might be shared among _SOURCES variables
+ # for different programs/libraries.
+ am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
++>>>>>>> upstream/0.6.2
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -172,6 -242,7 +269,7 @@@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY
COREAUDIO_LIBS = @COREAUDIO_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@@ -192,10 -263,12 +290,12 @@@ ECHO_N = @ECHO_N
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ FAAD2_CFLAGS = @FAAD2_CFLAGS@
FAAD2_LIBS = @FAAD2_LIBS@
FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
FGREP = @FGREP@
+ FLAC_CFLAGS = @FLAC_CFLAGS@
FLAC_LIBS = @FLAC_LIBS@
GENCAT = @GENCAT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@@ -218,6 -291,7 +318,7 @@@ HAVE_SNPRINTF = @HAVE_SNPRINTF
HAVE_VISIBILITY = @HAVE_VISIBILITY@
HAVE_WPRINTF = @HAVE_WPRINTF@
HAVE_YASM = @HAVE_YASM@
+ HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
HOTKEYS_LIBS = @HOTKEYS_LIBS@
ICONV_LIB = @ICONV_LIB@
IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@@ -271,6 -345,7 +372,7 @@@ LTLIBMULTITHREAD = @LTLIBMULTITHREAD
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
+ MAD_CFLAGS = @MAD_CFLAGS@
MAD_LIBS = @MAD_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@@ -289,6 -364,8 +391,8 @@@ OBJCDEPMODE = @OBJCDEPMODE
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+ OGG_CFLAGS = @OGG_CFLAGS@
+ OGG_LIBS = @OGG_LIBS@
OSS_CFLAGS = @OSS_CFLAGS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
@@@ -314,13 -391,17 +418,17 @@@ RANLIB = @RANLIB
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+ SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
VFS_CURL_LIBS = @VFS_CURL_LIBS@
+ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
WAVPACK_LIBS = @WAVPACK_LIBS@
WINDRES = @WINDRES@
WOE32 = @WOE32@
@@@ -329,7 -410,9 +437,9 @@@ XGETTEXT = @XGETTEXT
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YASM_FLAGS = @YASM_FLAGS@
+ ZIP_CFLAGS = @ZIP_CFLAGS@
ZIP_LIBS = @ZIP_LIBS@
+ ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@@ -422,7 -505,7 +532,7 @@@ top_srcdir = @top_srcdir
# libwma-ff/mdct.c\
# libwma-ff/fft.c\
# libwma-ff/aactab.c
- @HAVE_WMA_TRUE at wma_la_LDFLAGS = -module
+ @HAVE_WMA_TRUE at wma_la_LDFLAGS = -module -avoid-version
@HAVE_WMA_TRUE at wma_la_LIBADD = $(LDADD)
@HAVE_WMA_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -I$(wmapath)
all: all-am
@@@ -459,6 -542,7 +569,7 @@@ $(top_srcdir)/configure: @MAINTAINER_MO
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@@ -485,14 -569,17 +596,17 @@@ uninstall-pkglibLTLIBRARIES
clean-pkglibLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
- @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
wma.la: $(wma_la_OBJECTS) $(wma_la_DEPENDENCIES) $(EXTRA_wma_la_DEPENDENCIES)
- $(wma_la_LINK) $(am_wma_la_rpath) $(wma_la_OBJECTS) $(wma_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(wma_la_LINK) $(am_wma_la_rpath) $(wma_la_OBJECTS) $(wma_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@@ -511,74 -598,74 +625,74 @@@ distclean-compile
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wmafixed.Plo at am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
- @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
asf.lo: libasf/asf.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT asf.lo -MD -MP -MF $(DEPDIR)/asf.Tpo -c -o asf.lo `test -f 'libasf/asf.c' || echo '$(srcdir)/'`libasf/asf.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/asf.Tpo $(DEPDIR)/asf.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libasf/asf.c' object='asf.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT asf.lo -MD -MP -MF $(DEPDIR)/asf.Tpo -c -o asf.lo `test -f 'libasf/asf.c' || echo '$(srcdir)/'`libasf/asf.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/asf.Tpo $(DEPDIR)/asf.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libasf/asf.c' object='asf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o asf.lo `test -f 'libasf/asf.c' || echo '$(srcdir)/'`libasf/asf.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o asf.lo `test -f 'libasf/asf.c' || echo '$(srcdir)/'`libasf/asf.c
wmafixed.lo: libwma/wmafixed.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wmafixed.lo -MD -MP -MF $(DEPDIR)/wmafixed.Tpo -c -o wmafixed.lo `test -f 'libwma/wmafixed.c' || echo '$(srcdir)/'`libwma/wmafixed.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/wmafixed.Tpo $(DEPDIR)/wmafixed.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libwma/wmafixed.c' object='wmafixed.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wmafixed.lo -MD -MP -MF $(DEPDIR)/wmafixed.Tpo -c -o wmafixed.lo `test -f 'libwma/wmafixed.c' || echo '$(srcdir)/'`libwma/wmafixed.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wmafixed.Tpo $(DEPDIR)/wmafixed.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libwma/wmafixed.c' object='wmafixed.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wmafixed.lo `test -f 'libwma/wmafixed.c' || echo '$(srcdir)/'`libwma/wmafixed.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wmafixed.lo `test -f 'libwma/wmafixed.c' || echo '$(srcdir)/'`libwma/wmafixed.c
wmadeci.lo: libwma/wmadeci.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wmadeci.lo -MD -MP -MF $(DEPDIR)/wmadeci.Tpo -c -o wmadeci.lo `test -f 'libwma/wmadeci.c' || echo '$(srcdir)/'`libwma/wmadeci.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/wmadeci.Tpo $(DEPDIR)/wmadeci.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libwma/wmadeci.c' object='wmadeci.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wmadeci.lo -MD -MP -MF $(DEPDIR)/wmadeci.Tpo -c -o wmadeci.lo `test -f 'libwma/wmadeci.c' || echo '$(srcdir)/'`libwma/wmadeci.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wmadeci.Tpo $(DEPDIR)/wmadeci.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libwma/wmadeci.c' object='wmadeci.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wmadeci.lo `test -f 'libwma/wmadeci.c' || echo '$(srcdir)/'`libwma/wmadeci.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wmadeci.lo `test -f 'libwma/wmadeci.c' || echo '$(srcdir)/'`libwma/wmadeci.c
fft-ffmpeg.lo: libwma/fft-ffmpeg.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fft-ffmpeg.lo -MD -MP -MF $(DEPDIR)/fft-ffmpeg.Tpo -c -o fft-ffmpeg.lo `test -f 'libwma/fft-ffmpeg.c' || echo '$(srcdir)/'`libwma/fft-ffmpeg.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/fft-ffmpeg.Tpo $(DEPDIR)/fft-ffmpeg.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libwma/fft-ffmpeg.c' object='fft-ffmpeg.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fft-ffmpeg.lo -MD -MP -MF $(DEPDIR)/fft-ffmpeg.Tpo -c -o fft-ffmpeg.lo `test -f 'libwma/fft-ffmpeg.c' || echo '$(srcdir)/'`libwma/fft-ffmpeg.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fft-ffmpeg.Tpo $(DEPDIR)/fft-ffmpeg.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libwma/fft-ffmpeg.c' object='fft-ffmpeg.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fft-ffmpeg.lo `test -f 'libwma/fft-ffmpeg.c' || echo '$(srcdir)/'`libwma/fft-ffmpeg.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fft-ffmpeg.lo `test -f 'libwma/fft-ffmpeg.c' || echo '$(srcdir)/'`libwma/fft-ffmpeg.c
mdct_lookup.lo: libwma/mdct_lookup.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdct_lookup.lo -MD -MP -MF $(DEPDIR)/mdct_lookup.Tpo -c -o mdct_lookup.lo `test -f 'libwma/mdct_lookup.c' || echo '$(srcdir)/'`libwma/mdct_lookup.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mdct_lookup.Tpo $(DEPDIR)/mdct_lookup.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libwma/mdct_lookup.c' object='mdct_lookup.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdct_lookup.lo -MD -MP -MF $(DEPDIR)/mdct_lookup.Tpo -c -o mdct_lookup.lo `test -f 'libwma/mdct_lookup.c' || echo '$(srcdir)/'`libwma/mdct_lookup.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mdct_lookup.Tpo $(DEPDIR)/mdct_lookup.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libwma/mdct_lookup.c' object='mdct_lookup.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdct_lookup.lo `test -f 'libwma/mdct_lookup.c' || echo '$(srcdir)/'`libwma/mdct_lookup.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdct_lookup.lo `test -f 'libwma/mdct_lookup.c' || echo '$(srcdir)/'`libwma/mdct_lookup.c
mdct.lo: libwma/mdct.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdct.lo -MD -MP -MF $(DEPDIR)/mdct.Tpo -c -o mdct.lo `test -f 'libwma/mdct.c' || echo '$(srcdir)/'`libwma/mdct.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mdct.Tpo $(DEPDIR)/mdct.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libwma/mdct.c' object='mdct.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdct.lo -MD -MP -MF $(DEPDIR)/mdct.Tpo -c -o mdct.lo `test -f 'libwma/mdct.c' || echo '$(srcdir)/'`libwma/mdct.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mdct.Tpo $(DEPDIR)/mdct.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libwma/mdct.c' object='mdct.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdct.lo `test -f 'libwma/mdct.c' || echo '$(srcdir)/'`libwma/mdct.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdct.lo `test -f 'libwma/mdct.c' || echo '$(srcdir)/'`libwma/mdct.c
ffmpeg_bitstream.lo: libwma/ffmpeg_bitstream.c
- @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ffmpeg_bitstream.lo -MD -MP -MF $(DEPDIR)/ffmpeg_bitstream.Tpo -c -o ffmpeg_bitstream.lo `test -f 'libwma/ffmpeg_bitstream.c' || echo '$(srcdir)/'`libwma/ffmpeg_bitstream.c
- @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ffmpeg_bitstream.Tpo $(DEPDIR)/ffmpeg_bitstream.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libwma/ffmpeg_bitstream.c' object='ffmpeg_bitstream.lo' libtool=yes @AMDEPBACKSLASH@
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ffmpeg_bitstream.lo -MD -MP -MF $(DEPDIR)/ffmpeg_bitstream.Tpo -c -o ffmpeg_bitstream.lo `test -f 'libwma/ffmpeg_bitstream.c' || echo '$(srcdir)/'`libwma/ffmpeg_bitstream.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ffmpeg_bitstream.Tpo $(DEPDIR)/ffmpeg_bitstream.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libwma/ffmpeg_bitstream.c' object='ffmpeg_bitstream.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ffmpeg_bitstream.lo `test -f 'libwma/ffmpeg_bitstream.c' || echo '$(srcdir)/'`libwma/ffmpeg_bitstream.c
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ffmpeg_bitstream.lo `test -f 'libwma/ffmpeg_bitstream.c' || echo '$(srcdir)/'`libwma/ffmpeg_bitstream.c
mostlyclean-libtool:
-rm -f *.lo
@@@ -586,26 -673,15 +700,15 @@@
clean-libtool:
-rm -rf .libs _libs
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+ tags: tags-am
+ TAGS: tags
+
+ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@@ -617,15 -693,11 +720,11 @@@
$$unique; \
fi; \
fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ ctags: ctags-am
+
+ CTAGS: ctags
+ ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@@ -634,6 -706,21 +733,21 @@@ GTAGS
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+ cscopelist: cscopelist-am
+
+ cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@@ -778,19 -865,20 +892,20 @@@ uninstall-am: uninstall-pkglibLTLIBRARI
.MAKE: install-am install-strip
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkglibLTLIBRARIES \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkglibLTLIBRARIES install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-pkglibLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --combined po/be.po
index a6b43c0,0f1386a..ad085b5
--- a/po/be.po
+++ b/po/be.po
@@@ -3,15 -3,17 +3,23 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+ # Yauhen Bugamol <haxycgm at gmail.com>, 2013
+ # Yauhen Bugamol <haxycgm at gmail.com>, 2013
# МакÑім Тамковіч <quendimax at tut.by>, 2011
# МакÑім Томкавіч <quendimax at tut.by>, 2011
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:49+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Belarusian (http://www.transifex.com/projects/p/deadbeef-"
"player/language/be/)\n"
"Language: be\n"
@@@ -21,17 -23,17 +29,17 @@@
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Пра праграму DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "Змены ў DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Перакладчыкі DeaDBeeF"
@@@ -88,792 -90,819 +96,831 @@@ msgstr "Ðбнуліць перадуз
msgid "Zero Bands"
msgstr "Ðбнуліць чаÑтоты"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Профілі"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 дзень %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d дзён %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Стоп | %d Ñ‚Ñ€Ñкаў | %s агульны чаÑ"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Мона"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Мона"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "СтÑÑ€Ñа"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d кбіт/Ñ "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Паўза | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dГц | %d біт | %s | %d:%02d / %s | %d Ñ‚Ñ€Ñкаў | %s агульны чаÑ"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Ðовы плÑйліÑÑ‚"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Ðовы плÑйліÑÑ‚ (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
- msgstr ""
+ msgstr "ПлÑйліÑÑ‚ Ñа ÑžÑтаўкамі"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
- msgstr ""
+ msgstr "ПлÑйліÑÑ‚"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
- msgstr ""
+ msgstr "ПадзÑлÑльнік (верху Ñ– нізу)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
- msgstr ""
+ msgstr "ПадзÑлÑльнік (левага Ñ– правага)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
- msgstr ""
+ msgstr "Укладкі плÑйліÑта"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
- msgstr ""
+ msgstr "Паказваць вокладкі альбомаў"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
+ msgstr "Кнопка"
+
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Ðе ўдалоÑÑ Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ñ†ÑŒ файл даведкі"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Ðе ўдалоÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ–Ñ†ÑŒ файл даведкі"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
- msgstr ""
+ msgstr "ÐаÑамрÑч жадаеце выйÑці?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Увага"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Файл"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Ðдкрыць файл(Ñ‹)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Дадаць файл(ы)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Дадаць каталог(і)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Дадаць меÑцазнаходжанне"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Ðовы плÑйліÑÑ‚"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Прачытаць плÑйліÑÑ‚"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "ЗапіÑаць плÑйліÑÑ‚"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_ВыйÑцi"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Ð Ñдагаваць"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_ÐчыÑціць"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Вылучыць уÑÑ‘"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "ЗнÑць вылучÑнне"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Інвертаваць вылучÑнне"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "ВылучÑнне"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Сцерці"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Пакінуць вылучанае"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_ЗнайÑці"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Ðазва"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Ðумар Ñ‚Ñ€Ñка"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Ðльбом"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Выканаўца"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Дата"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Выпадкова"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "КарыÑтальніцкі"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Ðаладкі"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_ВыглÑд"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Радок Ñтану"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ðквалайзер"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "Прай_граванне"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Чарга"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "ЛінейнаÑ"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "ПерамÑшаць Ñ‚Ñ€Ñкі"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "ПерамÑшаць альбомы"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Паўтараць"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
- msgstr ""
+ msgstr "Паўтор плÑйліÑта"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
- msgstr ""
+ msgstr "Паўтараць адзіны запіÑ"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
- msgstr ""
+ msgstr "Ðе паўтараць"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Пракручваць плÑйліÑÑ‚ аўтаматычна"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Вылучаць бÑгучы Ñ‚Ñ€Ñк"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Спыніць паÑÐ»Ñ Ð±Ñгучага"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "ПерайÑці на бÑгучы Ñ‚Ñ€Ñк"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Даведка"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Змены"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Пра праграму"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Перакладчыкі"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Пошук"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Стоп"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Прайграць"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Паўза"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "ПапÑÑ€ÑднÑÑ"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "ÐаÑтупнаÑ"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Граць выпадкова"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Пра праграму"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "ВыйÑці"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Даведка"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "УлаÑціваÑці Ñ‚Ñ€Ñка"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
- msgstr ""
+ msgstr "МеÑцазнаходжанне"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "ÐаÑтаўленні"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Ужыць"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Замкнуць"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "МетаданыÑ"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "УлаÑціваÑці"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Ðазва:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "УвÑдзіце назву новага Ñлупка"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Тып:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Ðумар"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Прайграецца"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Вокладка альбома"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Выканаўца - Ðльбом"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "ПрацÑглаÑць"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Ðумар Ñ‚Ñ€Ñка"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Гурт / Выканаўца альбома"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Фармат:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Выраўніванне:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Па леваму краю"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Па праваму краю"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_СкаÑаваць"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_ОК"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Модуль вываду:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Прылада вываду:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "ЗаўÑёды канверÑаваць 8-біт аўдыё Ñž 16-біт"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Гук"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Ð Ñжым аўтаўÑтаноўкі гучнаÑці:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Ðдключаны"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "ТрÑк"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "ВыкарыÑтоўваць пікавае значÑнне"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 дБ"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 дБ"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Перадузмацненне з рыплÑйгейна:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Глабальнае перадузмацненне:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Дадаваць файлы з загаднага радка (ці файлавага кіраўніка) у гÑÑ‚Ñ‹ плÑйліÑÑ‚:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "УзнаўлÑць папÑÑ€Ñдні ÑÐµÐ°Ð½Ñ Ð¿Ñ€Ñ‹ запуÑку"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Ðе дадаваць з архіваў пры праглÑдзе каталога"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Прайграванне"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "КанфігурацыÑ"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Профіль ланцужкоў DSP"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Чытаць"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Згортваць у Ñ‚Ñ€Ñй замеÑÑ‚ закрыццÑ"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Ðе паказваць іконку у Ñ‚Ñ€ÑÑ–"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "ЧаÑтата Ð°Ð±Ð½Ð°ÑžÐ»ÐµÐ½Ð½Ñ Ñ–Ð½Ñ‚ÑрфейÑу (разоў за Ñек.):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "ТÑкÑÑ‚ загалоўка пры прайграванні:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "ТÑкÑÑ‚ загалоўка пры Ñпыненні:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "Плагін графічнага інтÑрфейÑу (змена патрабуе перазапуÑку):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Прыбраць пункт \"Сцерці з дыÑка\" з кантÑкÑтнага меню"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Ðўтаматычна называць плÑйліÑÑ‚, калі дадаецца адзін каталог"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "ЗамÑніць"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "ПÑÑ€Ñдні план"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Фон"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "ÐÑÐ½Ð¾ÑžÐ½Ñ‹Ñ ÐºÐ¾Ð»ÐµÑ€Ñ‹"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "СÑÑ€Ñдні"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Светлы"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Цёмны"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Грунтоўны"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "ТÑкÑÑ‚"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Колеры картак"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"ЗамÑніць (гублÑюцца наÑтаўленні Ñ‚Ñмы GTK, але павÑлічваецца хуткаÑць "
"адлюÑтраваннÑ)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Цотны радок"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "ÐÑцотны радок"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Вылучаны радок"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Вылучаны Ñ‚ÑкÑÑ‚"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "КурÑор"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Колеры плÑйліÑта"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Колеры"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Уключыць прокÑÑ–-Ñервер"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "ÐдраÑ:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Порт:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Тып прокÑÑ–:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Ð†Ð¼Ñ ÐºÐ°Ñ€Ñ‹Ñтальніка:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Пароль:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Сетка"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -881,122 -910,128 +928,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "ВерÑÑ–Ñ: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "ÐўтарÑÐºÑ–Ñ Ð¿Ñ€Ð°Ð²Ñ‹"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Дадаткі"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Фармат"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Да павелічÑннÑ"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Да памÑншÑннÑ"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Вылучце плагін DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Плагін"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "ÐаÑтаўленні Ñ€Ñдактара Ñ‚Ñгаў"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ПіÑаць ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ПіÑаць ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "ПіÑаць APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Выразаць ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Выразаць ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Выразаць APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ВерÑÑ–Ñ ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Ñ€Ñкамендавана)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "Знаказбор ID3v1 (прадвызначаны iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ПіÑать ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1004,91 -1039,100 +1057,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
- msgstr ""
+ msgstr "Дадаткі:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Выканаўца / Ðльбом"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "ТрÑк â„–"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Дадаць у чаргу"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Выдаліць з чаргі"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Ðднавіць метададзеныÑ"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Выдаліць з жорÑткага дыÑка"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Дадаць Ñлупок"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Ð Ñдагаваць Ñлупок"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Прыбраць Ñлупок"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Групаваць па"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "ÐÑма"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Выканаўца/Дата/Ðльбом"
@@@ -1105,11 -1149,11 +1171,11 @@@ msgstr "ÐаÑтавіць %s
msgid "Default Audio Device"
msgstr "ÐŸÑ€Ð°Ð´Ð²Ñ‹Ð·Ð½Ð°Ñ‡Ð°Ð½Ð°Ñ Ð¿Ñ€Ñ‹Ð»Ð°Ð´Ð° аўдыё"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1117,7 -1161,7 +1183,7 @@@
msgid "Adding files..."
msgstr "Даданне файлаў..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "ІніцыÑлізацыÑ..."
@@@ -1130,103 -1174,103 +1196,113 @@@ msgid "Really close the window?
msgstr "Закрыць акно?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Ðекалькі велічынь] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Ключ"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Ключ"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "ЗначÑнне"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "ЗапіÑанне Ñ‚Ñгаў..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Ðазва:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Ðазвы палёў не могуць пачынацца з : ці _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Ðемагчыма дадаць поле"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Поле з такой назвай ужо Ñ‘Ñць, паÑпрабуйце назваць інакш."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Дадаць поле"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Сцерці поле"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Опцыі:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help ці -h ÐдлюÑтраваць даведку (гÑÑ‚Ñ‹ Ñ‚ÑкÑÑ‚) Ñ– выйÑці\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit ВыйÑці з плÑера\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr ""
" --version ÐдлюÑтраваць інфармацыю аб верÑÑ–Ñ– праграмы Ñ– выйÑці\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Пачаць граць\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Спыніць прайграванне\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Прыпыніць прайграванне\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Пераключыць паўзу\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1234,38 -1278,38 +1310,38 @@@ msgstr "
" --play-pause Пачаць прайграванне, калі Ñпынена, іначай пераключыць "
"паўзу\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next ÐаÑÑ‚ÑƒÐ½Ð°Ñ Ð¿ÐµÑÐ½Ñ Ñž плÑйліÑце\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev ПапÑÑ€ÑднÑÑ Ð¿ÐµÑÐ½Ñ Ñž плÑйліÑце\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Ð’Ñ‹Ð¿Ð°Ð´ÐºÐ¾Ð²Ð°Ñ Ð¿ÐµÑÐ½Ñ Ñž плÑліÑце\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Дадаць файл(Ñ‹) у Ñ–Ñнуючы плÑйліÑÑ‚\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT ÐдлюÑтраваць адфарматыраваную назву Ñ‚Ñ€Ñка\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1278,7 -1322,7 +1354,7 @@@ msgstr "
"каментарый,\n"
" %%r-аўтарÑÐºÑ–Ñ Ð¿Ñ€Ð°Ð²Ñ‹, %%e-пройдзены чаÑ\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1287,28 -1331,24 +1363,36 @@@ msgstr "
" Ðапрыклад: --nowplaying \"%%a - %%t\" павінна вывеÑці "
"на Ñкран \"artist - title\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " за падрабÑзнымі звеÑткамі, гл. http://sourceforge.net/"
- "apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Прадвызначана"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Так"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Прадвызначана"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Так"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Ðе"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1334,7 -1374,7 +1418,7 @@@ msgstr "
"Гурт / Выканаўца альбома\n"
"Рознае"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1342,7 -1382,7 +1426,7 @@@ msgstr "
"Левы\n"
"Правы"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1352,7 -1392,7 +1436,7 @@@ msgstr "
"ТрÑк\n"
"Ðльбом"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1360,7 -1400,7 +1444,7 @@@ msgstr "
"Да павелічÑннÑ\n"
"Да памÑншÑннÑ"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1368,14 -1408,7 +1452,7 @@@ msgstr "
"2.3 (Ð Ñкамендавана)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Ðе ўдалоÑÑ Ð·Ð½Ð°Ð¹Ñці файл выÑвы: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1387,7 -1420,7 +1464,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1680,7 -1713,7 +1757,7 @@@ msgstr "ÐÑžÑ‚Ð°Ð¼Ð°Ñ‚Ñ‹Ñ‡Ð½Ð°Ñ Ñ‡Ð°Ñ
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1697,35 -1730,40 +1774,40 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Файл ужо Ñ–Ñнуе. ПерапіÑаць?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "ПапÑÑ€Ñджанне канвертара"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Выберыце кадавальнік"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Памылка кадавальніка"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "ПераўтварÑнне..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Вылучыць каталог..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Ðе ўдалоÑÑ Ð·Ð°Ð¿Ñ–Ñаць профіль кадавальніка"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1733,77 -1771,77 +1815,77 @@@ msgstr "
"Праверце правы доÑтупу каталога, паÑпрабуйце іншую назву, ці выÑвабадзіце "
"меÑца на дыÑку"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "Профіль з такой назвай ужо Ñ–Ñнуе. ПаÑпрабуйце іншую назву."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Памылка"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Дадаць кадавальнік"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Ð Ñдагаваць кадавальнік"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Сцерці профіль"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "ГÑта дзеÑнне выдаліць вылучаны профіль. УпÑўнены?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Кадавальнікі"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Дадаць плагін у ланцуг DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Ðе ўдалоÑÑ Ð·Ð°Ð¿Ñ–Ñаць профіль DSP"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Ðовы профіль DSP"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Ð Ñдагаваць профіль DSP"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "Профілі DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Каталог вываду:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Ðазва файла вываду:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1813,89 -1851,89 +1895,89 @@@ msgstr "
"Канчатак файла (напр. mp3) будзе дададзены аўтаматычна.\n"
"Пакіньце гÑта поле пуÑтым Ð´Ð»Ñ Ð¿Ñ€Ð°Ð´Ð²Ñ‹Ð·Ð½Ð°Ñ‡ÑÐ½Ð½Ñ (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Кадавальнік:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "Профіль DSP:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "КолькаÑць нітак:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Фармат выходнага ÑÑмпла:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Захоўваць фармат крыніцы"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8-біт Ð·Ð½Ð°ÐºÐ°Ð²Ð°Ñ Ñ†ÑлаÑ"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16-біт Ð·Ð½Ð°ÐºÐ°Ð²Ð°Ñ Ñ†ÑлаÑ"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24-біт Ð·Ð½Ð°ÐºÐ°Ð²Ð°Ñ Ñ†ÑлаÑ"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32-біт Ð·Ð½Ð°ÐºÐ°Ð²Ð°Ñ Ñ†ÑлаÑ"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32-біт плыўнаÑ"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Калі файл Ñ–Ñнуе:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Спытаць"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "ПерапіÑаць"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Ð Ñдагаваць профіль кадавальніка"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Ðеназваны кадавальнік"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Канчатак файла вываду:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Ðапр. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Загадны радок:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1905,7 -1943,7 +1987,7 @@@ msgstr "
"Прыклад: lame - %o\n"
"%i for input file, %o for output file, - for stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1915,66 -1953,72 +1997,72 @@@ msgstr "
"<small>%o - назва файла вываду\n"
"%i - назва файла чаÑовага ўводу</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Метад:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Канвеер"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "ЧаÑовы файл"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Ð Ñдактар Ñ‚Ñгаў</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "Ð Ñдактар профілÑÑž DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Ðеназваны профіль DSP"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Дадаць"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Ðе ўдалоÑÑ Ð·Ð½Ð°Ð¹Ñці файл выÑвы: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2002,27 -2046,27 +2090,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
- msgstr ""
+ msgstr "Ð Ñдагаваць"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
- msgstr ""
+ msgstr "Зачыніць"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
- msgstr ""
+ msgstr "Ð Ñдагаваць каманду"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
- msgstr ""
+ msgstr "Каманда:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2031,74 -2075,74 +2119,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2106,90 -2150,90 +2194,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
- msgstr ""
+ msgstr "Дадаць каманду"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
- msgstr ""
+ msgstr "УÑе файлы(*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
- msgstr ""
+ msgstr "Ðдкрыць файл(Ñ‹)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
- msgstr ""
+ msgstr "Дадаць файл(Ñ‹) Ñž плÑйліÑÑ‚..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
- msgstr ""
+ msgstr "Дадаць папку(Ñ–) Ñž плÑйліÑÑ‚..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2216,102 -2260,111 +2308,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
- msgid "Cut"
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
msgstr ""
+ #: ../plugins/gtkui/widgets.c:804
++>>>>>>> upstream/0.6.2
+ msgid "Cut"
+ msgstr "ВынÑць"
+
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:633
++=======
+ #: ../plugins/gtkui/widgets.c:811
++>>>>>>> upstream/0.6.2
msgid "Copy"
- msgstr ""
+ msgstr "КапіÑваць"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:640
++=======
+ #: ../plugins/gtkui/widgets.c:818
++>>>>>>> upstream/0.6.2
msgid "Paste"
- msgstr ""
+ msgstr "УÑтавіць"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/bg.po
index 023cbdf,7f7ad65..4dddade
--- a/po/bg.po
+++ b/po/bg.po
@@@ -7,9 -7,9 +7,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:49+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Bulgarian (http://www.transifex.com/projects/p/deadbeef-"
"player/language/bg/)\n"
"Language: bg\n"
@@@ -18,17 -18,17 +24,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "ОтноÑно DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s СпиÑък Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Преводачи на DeaDBeeF"
@@@ -85,792 -85,819 +91,831 @@@ msgstr "Ðнулирай предуÑи
msgid "Zero Bands"
msgstr "Ðнулирай лентите"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Предварително зададени"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 ден %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d дена %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "СпрÑн | %d пеÑни | %s времетраене"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Моно"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Моно"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Стерео"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d кбвÑ"
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Паузиран |"
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr "%s%s %s| %dХц | %d бит | %s | %d:%02d / %s | %d пеÑни | %s времетраене"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Ðов СпиÑък"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Ðов СпиÑък (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Грешка при четене на помощен файл"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Грешка при зареждане на помощен файл"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Предупреждение"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Файл"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_ОтварÑне на файл(ове)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Добави файл(ове)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Добави папка/и"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Добави меÑтоположение"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Ðов ÑпиÑък"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Зареждане на ÑпиÑък"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "ЗпаметÑване на ÑпиÑъка"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Изход от приложението"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Редактиране"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_ИзчиÑтване"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Маркиране на вÑички"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Демаркиране на вÑички"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Обръщане на избора"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Подбиране"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Премахване"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "ИзрÑзване"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_ТърÑене"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Заглавие"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Ðомер на файла"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Ðлбум"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Изпълнител"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Дата"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Произволно"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Предпочитани"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "ПредпочитаниÑ"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Изглед"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Панел на ÑÑŠÑтоÑнието"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Тонкоректор"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_ИзпълнÑва Ñе"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Подредба"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Линейно"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Разбъркване на пеÑни"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Разбъркване на албуми"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "ПовтарÑемоÑÑ‚"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Превъртане Ñледва изпълнÑването"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "КурÑора Ñледва изпълнÑването"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Спри Ñлед текущото"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "ПреÑкачане до текущата пеÑен"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Помощ"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Отчет"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "От_ноÑно"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "П_реводачи"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "ТърÑене"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Спиране"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "ПуÑкане"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Паузиране"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Предишна"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Следваща"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Произволно изпълнÑване"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "ОтноÑно"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Изход"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Помощ"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "СвойÑтва за ПеÑента"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "ÐаÑтройки"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Прилагане"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_ЗатварÑне"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Метаданни"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "СвойÑтва"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Заглавие:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Име на нова колона:"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Вид:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Ð˜Ð½Ð´ÐµÐºÑ Ð½Ð° елемента"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "ИзпълнÑва Ñе"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Обложка на албума"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Изпълнител - Ðлбум"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "ПродължителноÑÑ‚"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Ðомер на пеÑента"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Група / Изпълнител на албума"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Формат:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "ПодравнÑване:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "ЛÑво"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "ДÑÑно"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Отказ"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_Да"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Изходна приÑтавка:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Иходно уÑтройÑтво:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Винаги да Ñе конвертира 8-битов звук в 16-битов"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Звук"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Режим на уÑилване:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Деактивиране"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Име на файла"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Скала за уÑилване на макÑимума"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 дБ"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 дБ"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Режим на уÑилване:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "УÑилване за цÑлата ÑиÑтема:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"ДобавÑне на файлове Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° (или файлов мениджър) в този лиÑÑ‚ за "
"изпълнение:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "При Ñледващото Ñтартиране, продължи предишната ÑеÑиÑ"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Да не Ñе добавÑÑ‚ от архиви, когато Ñе добавÑÑ‚ папки"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Възпроизвеждане"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "ÐаÑтройване"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Запамети зададеното за DSP (Разпределение на цифровите Ñигнали)"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "Заре_ждане"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "Разпределение на цифровите Ñигнали (DSP)"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "При затварÑне, минимизирай в панела"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Скрий иконата в таблата"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "ОпреÑнÑване (пъти в Ñекунда):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Заглавен текÑÑ‚ при изпълнение:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Заглавен текÑÑ‚ при Ñпиране:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "ПриÑтавка за Ð³Ñ€Ð°Ñ„Ð¸Ñ‡Ð½Ð¸Ñ Ð²Ð¸Ð´ (промÑната изиÑква реÑтарт):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Скриване на елемент от менюто - \"Изтриване от ДиÑка\""
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
"Ðвтоматично именуване на лиÑта за изпълнение, когато е добавена Ñамо една "
"папка"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "ПрезапиÑ"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Ðа преден план"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Ðа фон"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "ЦвÑÑ‚ на бутона за Превъртане/УÑилване"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Среден"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Светъл"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Тъмен"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "ОÑновен"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "ТекÑÑ‚"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Цветове на разделната лента"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "ÐŸÑ€ÐµÐ·Ð°Ð¿Ð¸Ñ (увеличава Ñе производителноÑтта, но Ñе губи еÑтетиката)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Четен ред"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Ðечетен ред"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "МаркираниÑÑ‚ ред"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "МаркираниÑÑ‚ текÑÑ‚"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "КурÑор"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Цветове на лиÑта"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Цветове"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Ðктивиране на помощен Ñървър"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° Ð¿Ð¾Ð¼Ð¾Ñ‰Ð½Ð¸Ñ Ñървър:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Порт на Ð¿Ð¾Ð¼Ð¾Ñ‰Ð½Ð¸Ñ Ñървър:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Вид помощен Ñървър:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "ПотребителÑко име:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Парола:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Мрежа"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -878,122 -905,128 +923,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "ВерÑиÑ:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Copyright"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "ПриÑтавки"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "ÐдреÑ:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Формат"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "ВъзходÑщ"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "ÐизходÑщ"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Избор на приÑтавка за DSP (разпределение на цифровите Ñигнали)"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "ПриÑтавка"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "ÐаÑтройки на редактора на етикети"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Запиши ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Запиши ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Зпаиши APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Лента ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Лента ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Лента APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ВерÑÐ¸Ñ Ð½Ð° ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Препоръчителна)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ТранÑлиране на Ñимволите за ID3v1 (по подразбиране е iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Запиши ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1001,91 -1034,100 +1052,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "ÐртиÑÑ‚/Ðлбум"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Ðомер на ПеÑента"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Добави в опашката за изпълнение"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Премахни от опашката за изпълнение"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Презареди метаданните"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Прехани от ноÑителÑ"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "ДобавÑне на Колона"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Редактиране на Колона"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Премахване на Колона"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Групиране по"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Ðищо"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Изпълнител/Дата/Ðлбум"
@@@ -1102,11 -1144,11 +1166,11 @@@ msgstr "ÐаÑтройване на %s
msgid "Default Audio Device"
msgstr "Ðудио уÑтройÑтво по подразбиране"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1114,7 -1156,7 +1178,7 @@@
msgid "Adding files..."
msgstr "ДобавÑне на файлове..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Разпознаване..."
@@@ -1127,102 -1169,102 +1191,112 @@@ msgid "Really close the window?
msgstr "Да Ñе затвори ли прозореца?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[МножеÑтво ÑтойноÑти]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Ключ"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Ключ"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "СтойноÑÑ‚"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "ЗапиÑване на етикетите..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Име:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Имената на полетата не могат да започват Ñ \":\" или \"_\""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Ðе може да бъде добавено поле"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Вече ÑъщеÑтвува поле ÑÑŠÑ Ñъщото име, Ð¼Ð¾Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð²Ð°Ð¹Ñ‚Ðµ Ñ Ð´Ñ€ÑƒÐ³Ð¾!"
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "ДобавÑне на поле"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Премахване на поле"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Опции:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr "--help или -h ИзпиÑва помощ (това Ñъобщение) и излиза\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr "--quit Изход от Плейъра\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr "--version ИзпиÑва Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° верÑиÑта и излиза\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr "--play Възпроизвеждане\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr "--stop Спиране\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr "--pause Паузиране\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr "--toggle-pause Превключване в\\от режим на пауза\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1230,38 -1272,38 +1304,38 @@@ msgstr "
"--play-pause Започване на възпроизвеждане, ако е ÑпрÑно или излизане от "
"режим на пауза\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr "--next Следващата пеÑен в лиÑта\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr "--prev Предишната пеÑен в лиÑта\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr "--random Произволна пеÑен от лиÑта\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr "--queue ПрибавÑне на файл(ове) в ÑъщеÑÑ‚Ð²ÑƒÐ²Ð°Ñ‰Ð¸Ñ Ð»Ð¸ÑÑ‚\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr "--nowplaying \"Формат\" ИзпиÑва Форматирано име\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1272,35 -1314,31 +1346,43 @@@ msgstr "
"[b]-Ðлбум, [l]-Времетраене, [n]-Ðомер на пеÑента,\n"
"[y]-Година, [c]-Коментар, [r]-ÐвторÑки права, [e]-Изминали\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
"- title\"\n"
msgstr "пр.: --nowplaying \"%%a - %%t\" ще изведе \"изпълнител - пеÑен\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- "За повече информациÑ: http://sourceforge.net/apps/mediawiki/deadbeef/index."
- "php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "По подразбиране"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Да"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "По подразбиране"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Да"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Ðе"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1326,7 -1364,7 +1408,7 @@@ msgstr "
"Група/Ðлбумен Изпълнител\n"
"Обичайни"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1334,7 -1372,7 +1416,7 @@@ msgstr "
"ЛÑво\n"
"ДÑÑно"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1344,7 -1382,7 +1426,7 @@@ msgstr "
"ПеÑен\n"
"Ðлбум"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1352,7 -1390,7 +1434,7 @@@ msgstr "
"ВъзходÑщо\n"
"ÐизходÑщо"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1360,14 -1398,7 +1442,7 @@@ msgstr "
"2.3 (Препоръчителна)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Ðе е открито Ð¥-изображение: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1380,7 -1411,7 +1455,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1674,7 -1705,7 +1749,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1691,35 -1722,40 +1766,40 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Файлът вече ÑъщеÑтвува. ПрезипаÑване?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Внимание при превръщане"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "ÐœÐ¾Ð»Ñ Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ кодиране"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Грешка при превръщане"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Превръщане..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Избор на директориÑ..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "ÐеуÑпех при запиÑване за избраното кодиране"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1727,77 -1763,77 +1807,77 @@@ msgstr "
"Проверете правата за избраната папка, пробвайте да изберете друго име на "
"файла или оÑвободете мÑÑто на диÑка."
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "Дублират Ñе имената. Пробвайте да изберете друго име."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Грешка"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Добави ново кодиране"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Редактиране на кодирането"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Премахни зададеното"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Това ще премахне Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð». Сигурни ли Ñте?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Планове за кодиране"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Слагане на добавка в DSP канала"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "ÐеуÑпех при запаметÑване на DSP профила"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Ðов DSP профил"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Редактирай DSP профила"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP профили"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Резултатна директориÑ:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Име на Ñ€ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1808,89 -1844,89 +1888,89 @@@ msgstr "
"За използване на наÑтройките по подразбиране оÑтавете полето празно (%a - "
"%t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Кодиране:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP профил:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Брой на нишките:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Формат на резултатната чеÑтота:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Запази формата от източника"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8-битов подпиÑ"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16-битов подпиÑ"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24-битов подпиÑ"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32-битов подпиÑ"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32-битов (плаващ)"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Когато файла ÑъщеÑтвува:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "ПодÑказване"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "ПрезапиÑване"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Редактиране на профила за кодиране"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Ðеименуван профил за кодиране"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Разширение на Ñ€ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Пример: mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Команда:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1901,7 -1937,7 +1981,7 @@@ msgstr "
"за файла източник \"%i\", за Ñ€ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» \"%o\", за Ñтандартен източник "
"\"-\""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1911,66 -1947,72 +1991,72 @@@ msgstr "
"<small>\"%o\" - име на резултатен файл\n"
"име на Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¸Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ðº - \"%i\"</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Метод:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Поток"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Временен файл"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "ЗапиÑване на APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ЗапиÑване на ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ЗапиÑване на ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Създаване на етикети</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "Редактор на DSP профили"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Ðеозаглавен DSP профил"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Добави"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Ðе е открито Ð¥-изображение: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1998,27 -2040,27 +2084,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2027,74 -2069,74 +2113,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2102,90 -2144,90 +2188,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2212,102 -2254,111 +2302,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/bn.po
index 9f34420,84c1950..02b2c0a
--- a/po/bn.po
+++ b/po/bn.po
@@@ -9,9 -9,9 +9,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:49+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Bengali (http://www.transifex.com/projects/p/deadbeef-player/"
"language/bn/)\n"
"Language: bn\n"
@@@ -20,17 -20,17 +26,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "DeaDBeeF %s সমà§à¦¬à¦¨à§à¦§à§‡"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s লগপরিবরà§à¦¤à¦¨"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr ""
@@@ -87,44 -87,44 +93,52 @@@ msgstr "শূনà§à¦¯ পà§à¦°à¦¿à¦®
msgid "Zero Bands"
msgstr "শূনà§à¦¯ বà§à¦¯à¦¾à¦¨à§à¦¡"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "পà§à¦°à¦¥à¦® দিন %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d দিন %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "বনà§à¦§ | %d টà§à¦°à§à¦¯à¦¾à¦•à¦¸à¦®à§à¦¹ | %s সরà§à¦¬à¦®à§‹à¦Ÿ যতটà§à¦•à§ সময় চালানো হয়েছে"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "মোনো"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "মোনো"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "সà§à¦Ÿà§‡à¦°à¦¿à¦“"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps"
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "বিরত | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -132,745 -132,772 +146,776 @@@ msgstr "
"%s%s %s| %dHz | %d বিট | %s | %d:%02d / %s | %d টà§à¦°à§à¦¯à¦¾à¦•à¦¸à¦®à§‚হ | %s যতটà§à¦•à§ সময় "
"চালানো হয়েছে"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "নতà§à¦¨ পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿ"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "নতà§à¦¨ পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿ (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "সহায়িকা ফাইল পড়তে বà§à¦¯à¦°à§à¦¥ হয়েছে"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "সহায়িকা ফাইল লোড করতে বà§à¦¯à¦°à§à¦¥ হয়েছে"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "সতরà§à¦•à¦¬à¦¾à¦¨à§€"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "ফাইল (_F)"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "ফাইল খà§à¦²à§à¦¨ (_O)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "ফাইল যোগ করà§à¦¨"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "ফোলà§à¦¡à¦¾à¦° যোগ করà§à¦¨"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "অবসà§à¦¥à¦¾à¦¨ যোগ করà§à¦¨"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "নতà§à¦¨ পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿ"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿ লোড করà§à¦¨"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿ সংরকà§à¦·à¦£ করà§à¦¨"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "পà§à¦°à¦¸à§à¦¥à¦¾à¦¨ করà§à¦¨ (_Q)"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "সমà§à¦ªà¦¾à¦¦à¦¨à¦¾ করà§à¦¨ (_Q)"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "মà§à¦›à§‡ ফেলà§à¦¨ (_C)"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "সব নিরà§à¦¬à¦¾à¦šà¦¨ করà§à¦¨"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "সব অনিরà§à¦¬à¦¾à¦šà¦¿à¦¤ করà§à¦¨"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "বিপরীতমà§à¦–ী নিরà§à¦¬à¦¾à¦šà¦¨"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "নিরà§à¦¬à¦¾à¦šà¦¨"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "অপসারণ"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "ছাà¦à¦Ÿà¦¾"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "খà§à¦à¦œà§à¦¨ (_F)"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "শিরোনাম"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr ""
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "অà§à¦¯à¦¾à¦²à¦¬à¦¾à¦®"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "শিলà§à¦ªà§€"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr ""
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "à¦à¦²à§‹à¦®à§‡à¦²à§‹"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "সà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "পছনà§à¦¦à¦¸à¦®à§‚হ"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "পà§à¦°à¦¦à¦°à§à¦¶à¦¨ করà§à¦¨ (_V)"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "সà§à¦Ÿà§à¦¯à¦¾à¦Ÿà¦¾à¦¸ বার"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "ইকà§à§Ÿà¦¾à¦²à¦¾à¦‡à¦œà¦¾à¦°"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦• (_P)"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "কà§à¦°à¦®"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "রৈখিক"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr ""
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr ""
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "পà§à¦¨à¦°à¦¾à¦¬à§ƒà¦¤à§à¦¤à¦¿ হচà§à¦›à§‡"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "সà§à¦•à§à¦°à¦² পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦•à¦•à§‡ অনà§à¦¸à¦°à¦£ করে"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "কারà§à¦¸à¦¾à¦° পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦•à¦•à§‡ অনà§à¦¸à¦°à¦£ করে"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "বরà§à¦¤à¦®à¦¾à¦¨à¦Ÿà¦¿ হয়ে যাওয়ার পর থামà§à¦¨"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr ""
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "সহায়তা (_H)"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "লগপরিবরà§à¦¤à¦¨ (_C)"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr ""
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "সমà§à¦¬à¦¨à§à¦§à§‡ (_A)"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr ""
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "অনà§à¦¸à¦¨à§à¦§à¦¾à¦¨ করà§à¦¨"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "বনà§à¦§ করà§à¦¨"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "চালান"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "বিরতি"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "পূরà§à¦¬à¦¬à¦°à§à¦¤à§€"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "পরবরà§à¦¤à§€"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "à¦à¦²à§‹à¦®à§‡à¦²à§‹à¦à¦¾à¦¬à§‡ চালান"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "সমà§à¦¬à¦¨à§à¦§à§‡"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "পà§à¦°à¦¸à§à¦¥à¦¾à¦¨ করà§à¦¨"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "সহায়তা"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "টà§à¦°à§à¦¯à¦¾à¦• বৈশিষà§à¦Ÿà§à¦¯à¦¾à¦¬à¦²à§€"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "পà§à¦°à§Ÿà§‹à¦— করà§à¦¨ (_A)"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "বনà§à¦§ করà§à¦¨ (_C)"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "মেটাডাটা"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "বৈশিষà§à¦Ÿà§à¦¯à¦¾à¦¬à¦²à§€"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "শিরোনাম:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "নতà§à¦¨ কলাম শিরোনাম দিন"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "টাইপ করà§à¦¨:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr ""
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "চলছে"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "অà§à¦¯à¦¾à¦²à¦¬à¦¾à¦® শিলà§à¦ª"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "শিলà§à¦ªà§€ - অà§à¦¯à¦¾à¦²à¦¬à¦¾à¦®"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "সà§à¦¥à¦¿à¦¤à¦¿à¦•à¦¾à¦²"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr ""
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "বà§à¦¯à¦¾à¦¨à§à¦¡ / অà§à¦¯à¦¾à¦²à¦¬à¦¾à¦® শিলà§à¦ªà§€"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "বিনà§à¦¯à¦¾à¦¸:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "পà§à¦°à¦¾à¦¨à§à¦¤à¦¿à¦•à¦•à¦°à¦£:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "বাম"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "ডান"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "বাতিল (_C)"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "ঠিক আছে (_O)"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "অাউটপà§à¦Ÿ পà§à¦²à¦¾à¦—ইন:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "অাউটপà§à¦Ÿ ডিà¦à¦¾à¦‡à¦¸:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "শবà§à¦¦"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "পà§à¦¨à¦°à¦¾à§Ÿ চালানোর মোড:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "নিষà§à¦•à§à¦°à¦¿à§Ÿ"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "টà§à¦°à§à¦¯à¦¾à¦•"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "পà§à¦¨à¦°à¦¾à§Ÿ চালনার সরà§à¦¬à§‹à¦šà§à¦š মান"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr ""
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr ""
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr ""
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "কনফিগার"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr ""
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr ""
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr ""
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "টà§à¦°à§‡ ছোট করতে বনà§à¦§ করà§à¦¨"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr ""
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "উপেকà§à¦·à¦¾ করা"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "পà§à¦°à§‹à¦à§‚মি"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "পটà¦à§‚মি"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "সিকবার/à¦à¦²à¦¿à¦‰à¦®à¦¬à¦¾à¦° à¦à¦° রঙ"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "মধà§à¦¯à¦¬à¦°à§à¦¤à§€"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "হালকা"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "গাà§"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "à¦à¦¿à¦¤à§à¦¤à¦¿"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "টেকà§à¦¸à¦Ÿ"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "টà§à¦¯à¦¾à¦¬à§‡à¦° অংশের রং"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "উপেকà§à¦·à¦¾ (GTK টà§à¦°à¦¿à¦à¦¿à¦‰ থিমিং হারায়, কিনà§à¦¤à§ পরিণত করার গতি বাড়ায়)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "জোড় সংখà§à¦¯à¦• সারি"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "বিজোড় সংখà§à¦¯à¦• সারি"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ সারি"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ টেকà§à¦¸à¦Ÿ"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "কারসার"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿà§‡à¦° রং"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "পà§à¦°à¦•à§à¦¸à¦¿ সারà§à¦à¦¾à¦° সকà§à¦°à¦¿à§Ÿ করà§à¦¨"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "পà§à¦°à¦•à§à¦¸à¦¿ সারà§à¦à¦¾à¦°à§‡à¦° ঠিকানা:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "পà§à¦°à¦•à§à¦¸à¦¿ সারà§à¦à¦¾à¦°à§‡à¦° পোরà§à¦Ÿ:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "পà§à¦°à¦•à§à¦¸à¦¿à¦° ধরণ:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "পà§à¦°à¦•à§à¦¸à¦¿ বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à§€à¦° নাম:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "পà§à¦°à¦•à§à¦¸à¦¿ পাসওয়ারà§à¦¡:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "নেটওয়ারà§à¦•"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -878,122 -905,128 +923,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr ""
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr ""
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "পà§à¦²à¦¾à¦—ইন"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr ""
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ID3v2 লিখà§à¦¨"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ID3v1 লিখà§à¦¨"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "APEv2 লিখà§à¦¨"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "ID3v2 অংশ"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "ID3v1 অংশ"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "APEv2 অংশ"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 সংসà§à¦•à¦°à¦£"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "২.৩ (সà§à¦ªà¦¾à¦°à¦¿à¦¶à¦•à§ƒà¦¤)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "২.৪"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 অকà§à¦·à¦° à¦à¦¨à¦•à§‹à¦¡ করছে (iso8859-1 পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ID3v2.4 লিখà§à¦¨"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1001,91 -1034,100 +1052,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "শিলà§à¦ªà§€ / অà§à¦¯à¦¾à¦²à¦¬à¦¾à¦®"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "টà§à¦°à§à¦¯à¦¾à¦• নং"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦•à§‡à¦° সারিতে যোগ করà§à¦¨"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦• সারি থেকে অপসারণ করà§à¦¨"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "মেটাডাটা পà§à¦¨à¦°à¦¾à§Ÿ লোড করà§à¦¨"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "ডিসà§à¦• থেকে অপসারণ করà§à¦¨"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "কলাম যোগ করà§à¦¨"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "কলাম সমà§à¦ªà¦¾à¦¦à¦¨à¦¾ করà§à¦¨"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "কলাম অপসারণ করà§à¦¨"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "যা অনà§à¦¸à¦¾à¦°à§‡ গà§à¦°à§à¦ª হবে"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "কোনটি না"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "শিলà§à¦ªà§€/তারিখ/অà§à¦¯à¦¾à¦²à¦¬à¦¾à¦®"
@@@ -1102,11 -1144,11 +1166,11 @@@ msgstr "
msgid "Default Audio Device"
msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ অডিও ডিà¦à¦¾à¦‡à¦¸"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1114,7 -1156,7 +1178,7 @@@
msgid "Adding files..."
msgstr "ফাইল যোগ করা হচà§à¦›à§‡..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "আরমà§à¦ করা হচà§à¦›à§‡..."
@@@ -1127,139 -1169,139 +1191,149 @@@ msgid "Really close the window?
msgstr "সতà§à¦¯à¦¿à¦‡ উইনà§à¦¡à§‹à¦Ÿà¦¿ বনà§à¦§ করতে চান?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "কী"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "কী"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "মান"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr ""
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "অপশন:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --সহায়তা অথবা -h সহায়তা মà§à¦¦à§à¦°à¦£ করà§à¦¨ (à¦à¦‡ বারà§à¦¤à¦¾) à¦à¦¬à¦‚ পà§à¦°à¦¸à§à¦¥à¦¾à¦¨ করà§à¦¨\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --বনà§à¦§ করà§à¦¨ পà§à¦²à§‡à§Ÿà¦¾à¦° বনà§à¦§ করà§à¦¨\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --সংসà§à¦•à¦°à¦£ সংসà§à¦•à¦°à¦£à§‡à¦° তথà§à¦¯ মà§à¦¦à§à¦°à¦£ করে বনà§à¦§ করà§à¦¨\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --চালান পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦• শà§à¦°à§ করà§à¦¨\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --বনà§à¦§ করà§à¦¨ পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦• বনà§à¦§ করà§à¦¨\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --বিরতি পà§à¦²à§‡à¦¬à§à¦¯à¦¾à¦• বিরত রাখà§à¦¨\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr ""
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --পরবরà§à¦¤à§€ পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿà§‡ পরবরà§à¦¤à§€ গান\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --পূরà§à¦¬à¦¬à¦°à§à¦¤à§€ পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿà§‡ পূরà§à¦¬à¦¬à¦°à§à¦¤à§€ গান\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --à¦à¦²à§‹à¦®à§‡à¦²à§‹ পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿà§‡ à¦à¦²à§‹à¦®à§‡à¦²à§‹ গান\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --সারি বিদà§à¦¯à¦®à¦¾à¦¨ পà§à¦²à§‡à¦²à¦¿à¦¸à§à¦Ÿà§‡ সবশেষে যোগ করা ফাইল\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --FMT à¦à¦–ন চলছে সà§à¦Ÿà§à¦¯à¦¾à¦¨à§à¦¡à¦†à¦‰à¦Ÿà§‡ বিনà§à¦¯à¦¾à¦¸à¦¿à¦¤ টà§à¦°à§à¦¯à¦¾à¦• নাম মà§à¦¦à§à¦°à¦£ করà§à¦¨\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1270,7 -1312,7 +1344,7 @@@ msgstr "
" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
" copy[r]ight, [e]lapsed\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1279,26 -1321,24 +1353,36 @@@ msgstr "
" e.g.: --à¦à¦–ন চলছে \"%%a - %%t\" মà§à¦¦à§à¦°à¦£ হবে \"শিলà§à¦ªà§€ - "
"শিরোনাম\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "হà§à¦¯à¦¾à¦"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "হà§à¦¯à¦¾à¦"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "না"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1313,7 -1353,7 +1397,7 @@@
"Custom"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1321,7 -1361,7 +1405,7 @@@ msgstr "
"বাম\n"
"ডান"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1331,13 -1371,13 +1415,13 @@@ msgstr "
"টà§à¦°à§à¦¯à¦¾à¦•\n"
"অà§à¦¯à¦¾à¦²à¦¬à¦¾à¦®"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1345,14 -1385,7 +1429,7 @@@ msgstr "
"২.৩ (সà§à¦ªà¦¾à¦°à¦¿à¦¶à¦•à§ƒà¦¤)‌‌\n"
"২.৪"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "pixmap ফাইল পায়নি: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1362,7 -1395,7 +1439,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1655,7 -1688,7 +1732,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1672,111 -1705,116 +1749,116 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr ""
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr ""
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr ""
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr ""
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr ""
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr ""
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr ""
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr ""
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr ""
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr ""
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1784,89 -1822,89 +1866,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr ""
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr ""
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr ""
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr ""
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr ""
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1874,7 -1912,7 +1956,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1882,66 -1920,72 +1964,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr ""
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr ""
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr ""
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr ""
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr ""
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr ""
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr ""
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "যোগ"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "pixmap ফাইল পায়নি: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1969,27 -2013,27 +2057,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -1998,74 -2042,74 +2086,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2073,90 -2117,90 +2161,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2183,102 -2227,111 +2275,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/ca.po
index aa058eb,c91c493..d4ed72c
--- a/po/ca.po
+++ b/po/ca.po
@@@ -3,13 -3,15 +3,21 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+ # vctrflc <chatgren at gmail.com>, 2014
+ # vctrflc <chatgren at gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:49+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Catalan (http://www.transifex.com/projects/p/deadbeef-player/"
"language/ca/)\n"
"Language: ca\n"
@@@ -18,28 -20,28 +26,28 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
- msgstr ""
+ msgstr "Sobre DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
- msgstr ""
+ msgstr "Registre de canvis de DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
- msgstr ""
+ msgstr "Traductors de DeaDBeeF"
#: ../plugins/gtkui/eq.c:141
msgid "Save DeaDBeeF EQ Preset"
- msgstr ""
+ msgstr "Desar la config. de l'EQ"
#: ../plugins/gtkui/eq.c:148
msgid "DeaDBeeF EQ preset files (*.ddbeq)"
- msgstr ""
+ msgstr "Fitxers de config. de l'EQ (*.ddbeq)"
#: ../plugins/gtkui/eq.c:187
msgid "Load DeaDBeeF EQ Preset..."
@@@ -75,7 -77,7 +83,7 @@@ msgstr "Activa
#: ../plugins/gtkui/eq.c:371
msgid "Zero All"
- msgstr ""
+ msgstr "Tots nuls"
#: ../plugins/gtkui/eq.c:378
msgid "Zero Preamp"
@@@ -85,788 -87,816 +93,828 @@@ msgstr "
msgid "Zero Bands"
msgstr ""
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
- msgstr ""
+ msgstr "Configs."
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
- msgstr ""
+ msgstr "1 dia %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
- msgstr ""
+ msgstr "%d dies %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
- msgstr ""
+ msgstr "Aturat | %d pistes | %s temps total"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
- msgstr ""
+ msgstr "Estèreo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
- msgstr ""
+ msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "En pausa |"
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
+ "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pistes | %s temps total"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Llista de Reproducció Nova"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Llista de Reproducció Nova (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
- msgstr ""
+ msgstr "Playlist amb pestanyes"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Error en la cà rrega del fitxer d'ajuda"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr ""
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Fitxer"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Obre fitxer(s)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Afegeix fitxer(s)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Afegeix fitxer(s)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Afegeix localització"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nova llista de reproducció"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Carrega la llista de reproducció"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Desa la llista de reproducció"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Surt"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Edita"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Neteja"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Selecciona-ho tot"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Deselecciona-ho tot"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Inverteix la selecció"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Selecció"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Elimina"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr ""
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr ""
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "TÃtol"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr ""
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Àlbum"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artista"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr ""
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Aleatori"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Personalització"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Preferències"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Vista"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Barra d'estat"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Equalitzador"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Reproducció"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Ordre"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr ""
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr ""
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr ""
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr ""
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr ""
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr ""
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Atura't en acabar l'actual"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr ""
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Ajuda"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Registre de Canvis"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr ""
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Sobre"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr ""
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Cerca"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Atura"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr ""
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "En pausa"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Anterior"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Següent"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Reproducció aleatòria"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Sobre"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Surt"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Ajuda"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Propietats del tema"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Aplica"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Tanca"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadada"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Propietats"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "TÃtol:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Introduïu un nou tÃtol de columna aquÃ"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Tipus:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr ""
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Reproduint"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr ""
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Artista - Àlbum"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr ""
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr ""
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Banda / Àlbum Artista"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Format:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Alineació:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Esquerra"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Dreta"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Cancel·la"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_Correcte"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Dispositiu de sortida"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "So"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr ""
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr ""
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr ""
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr ""
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr ""
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr ""
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr ""
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr ""
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr ""
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr ""
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr ""
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr ""
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr ""
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr ""
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr ""
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr ""
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr ""
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr ""
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr ""
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr ""
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr ""
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr ""
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr ""
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr ""
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr ""
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr ""
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr ""
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -874,122 -904,128 +922,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr ""
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr ""
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr ""
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr ""
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr ""
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr ""
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr ""
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr ""
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr ""
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr ""
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr ""
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr ""
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -997,91 -1033,100 +1051,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr ""
@@@ -1098,11 -1143,11 +1165,11 @@@ msgstr "
msgid "Default Audio Device"
msgstr ""
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1110,7 -1155,7 +1177,7 @@@
msgid "Adding files..."
msgstr "Afegint fitxers..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr ""
@@@ -1123,139 -1168,139 +1190,149 @@@ msgid "Really close the window?
msgstr ""
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr ""
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr ""
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr ""
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr ""
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr ""
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr ""
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr ""
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr ""
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr ""
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr ""
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr ""
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr ""
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr ""
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr ""
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1263,33 -1308,31 +1340,43 @@@
" copy[r]ight, [e]lapsed\n"
msgstr ""
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
"- title\"\n"
msgstr ""
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr ""
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr ""
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr ""
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr ""
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1304,39 -1347,32 +1391,32 @@@
"Custom"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
"Album"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
msgstr ""
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr ""
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1346,7 -1382,7 +1426,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1639,7 -1675,7 +1719,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1656,111 -1692,116 +1736,116 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr ""
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr ""
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr ""
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr ""
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr ""
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr ""
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr ""
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr ""
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr ""
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr ""
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1768,89 -1809,89 +1853,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr ""
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr ""
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr ""
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr ""
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr ""
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1858,7 -1899,7 +1943,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1866,66 -1907,72 +1951,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr ""
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr ""
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr ""
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr ""
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr ""
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr ""
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr ""
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr ""
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr ""
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1953,27 -2000,27 +2044,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -1982,74 -2029,74 +2073,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2057,90 -2104,90 +2148,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2167,102 -2214,111 +2262,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/cs.po
index af72d82,c43ce9a..e8c9473
--- a/po/cs.po
+++ b/po/cs.po
@@@ -3,16 -3,16 +3,22 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
- # pcpepik <pcpepik0 at gmail.com>, 2013
- # pcpepik <pcpepik0 at gmail.com>, 2013
+ # Joe Bliss <pcpepik0 at gmail.com>, 2013
+ # Joe Bliss <pcpepik0 at gmail.com>, 2013
# VaÅ¡ek KovářÃk <l3d9z6 at seznam.cz>, 2011
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:49+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Czech (http://www.transifex.com/projects/p/deadbeef-player/"
"language/cs/)\n"
"Language: cs\n"
@@@ -21,17 -21,17 +27,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "O aplikaci DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s ChangeLog"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF přeložili"
@@@ -88,44 -88,44 +94,52 @@@ msgstr "Vynulovat pÅ™edzesilovaÄ
msgid "Zero Bands"
msgstr "Vynulovat pásma"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Předvolby"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 den %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dnà %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Zastaveno | %d skladeb | %s celkový Äas pÅ™ehrávánÃ"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Zastaveno | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -133,749 -133,774 +147,778 @@@ msgstr "
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d skladeb | %s celkový Äas "
"pÅ™ehrávánÃ"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Nový playlist"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Nový playlist (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Playlist se záložkami"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Playlist"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "RozdÄ›lovaÄ (nahoÅ™e a dole)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "RozdÄ›lovaÄ (vlevo a vpravo)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Záložky playlistu"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Vlastnosti výběru"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Zobrazit obal alba"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "Křivka"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "Spektrálnà analyzér"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "TlaÄÃtko"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Chyba pÅ™i Ätenà souboru nápovÄ›dy"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Selhalo naÄtenà souboru nápovÄ›dy"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- "PÅ™ehrávaÄ momentálnÄ› provádà úlohy na pozadÃ. Pokud jej nynà ukonÄÃte, úlohy "
- "budou ukonÄeny Äi pÅ™eruÅ¡eny. Toto může způsobit ztrátu dat."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "Stále chcete odejÃt?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "UpozornÄ›nÃ"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Soubor"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_OtevÅ™Ãt soubor(y)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Přidat soubor(y)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Přidat složku(y)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "PÅ™idat umÃstÄ›nÃ"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nový playlist"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "NaÄÃst playlist"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Uložit playlist"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_ZavÅ™Ãt"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Upravit"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Smazat"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Vybrat vše"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Zrušit výběr"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Invertovat výběr"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Výběr"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Odstranit"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Ořez"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Hledat"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "TÅ™Ãdit dle"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Název"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "ÄŒÃslo stopy"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Umělec"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Datum"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Náhodně"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "VlastnÃ"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "NastavenÃ"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Zobrazit"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Stavový řádek"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ekvalizér"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "Režim návrhu"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Přehrát"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "PoÅ™adÃ"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Lineárně"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "PromÃsit skladby"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Náhodná alba"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "OpakovánÃ"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Opakovat vše"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Opakovat jednotlivou skladbu"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Neopakovat"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Posunovat s pÅ™ehrávánÃm"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Sledovat kurzorem pÅ™ehrávánÃ"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Zastavit po aktuálnÃ"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "PÅ™eskoÄit na aktuálnà stopu"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Nápověda"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_ChangeLog"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_O aplikaci"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Přeložili"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Hledat"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Zastavit"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Přehrát"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pauza"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "PÅ™edchozÃ"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "NásledujÃcÃ"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Přehrát náhodně"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Info"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Konec"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Nápověda"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Vlastnosti skladby"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "UmÃstÄ›nÃ:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "NastavenÃ"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_PoužÃt"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_ZavÅ™Ãt"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadata"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Vlastnosti"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Název:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Zde vložit nový název sloupce"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Typ:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "RejstÅ™Ãk"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "PÅ™ehrávánÃ"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Obal alba"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Umělec - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "TrvánÃ"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "ÄŒÃslo stopy"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Skupina / Skladatel"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Formát:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "ZarovnánÃ:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Vlevo"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Vpravo"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Zrušit"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Výstupnà zásuvné moduly:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Výstupnà zaÅ™ÃzenÃ:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Vždy převést 8 bit audio na 16 bit"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Zvuk"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Režim replaygain:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Zakázat"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Skladba"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "MěřÃtko vrcholu replaygain"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "PÅ™edzesilovaÄ replaygain:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Globálnà pÅ™edzesilovaÄ (preamp):"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"PÅ™idat soubory z pÅ™Ãkazové řádky (nebo souborového manažeru) do tohoto "
"playlistu:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "PÅ™i startu obnovit pÅ™edchozà sezenÃ"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Ignorovat archivy během přidávánà adresářů"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "Automaticky vynulovat \"Zastavit po aktuálnÃ\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Přehrát"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Nastavit"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Předvolba DSP"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_NaÄÃst"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "ZavÅ™Ãt do traye"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Skrýt ikonu v trayi"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "Povolit detekci a záznam ruského CP1251"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Povolit detekci a záznam ÄÃnského CP936"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Četnost obnovenà rozhranà (za vteřinu):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Titulnà text bÄ›hem pÅ™ehrávánÃ:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Titulnà text bÄ›hem zastavenÃ:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "Zásuvný modul GUI (změny vyžadujà restart):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Skrýt položku \"Smazat z disku\" z kontextového menu"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Automaticky pojmenovat přidaný adresář"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "GUI/Různé"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Předefinovat"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "PopÅ™edÃ"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "PozadÃ"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Barvy průbÄ›hu hledánÃ/hlasitosti"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "StÅ™ednÃ"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Světlé"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Tmavé"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "ZákladnÃ"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Text"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Barvy lišty záložek"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "PÅ™edefinovat (ztratà GTK téma, ale zrychlà vykreslovánÃ)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Sudý řádek"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Lichý řádek"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Vybraný řádek"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Vybraný text"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Kurzor"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Barvy playlistu"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Barvy"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Povolit server Proxy"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Adresa Proxy serveru:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Port Proxy serveru:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Typ Proxy:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Uživatelské jméno Proxy:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Heslo Proxy:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "HTTP User Agent:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "Upravit mapovánà Typu-Obsahu"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "SÃÅ¥"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<Nenastaveno>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Globálnà klávesová zkratka"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -883,122 -908,128 +926,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "Klávesové zkratky"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Verze: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Copyright"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Zásuvné moduly"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "Seskupit dle ..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "TÅ™Ãdit dle ..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Formát"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "VzestupnÄ›"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "SestupnÄ›"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Vybrat zásuvný modul DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Zásuvný modul"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Nastavenà autora popisku"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Zapsat ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Zapsat ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Zapsat APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Odstranit ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Odstranit ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Odstranit APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "Verze ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (DoporuÄeno)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "Kódovánà znaků ID3v1 (výchozà je iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Zapsat ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "Mapovánà Typu-Obsahu"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1010,91 -1041,100 +1059,104 @@@ msgstr "
"obsahu \"audio/x-mpeg\" a vyžadovat dekódovánà DeaDBeeF zásuvným modulem "
"\"stdmpg\" nebo \"ffmpeg\"."
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "Obnovit výchozÃ"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "Typ-Obsahu:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "Zásuvné moduly:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Umělec / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Skladba Ä."
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "PÅ™idat do fronty pÅ™ehrávánÃ"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Odstranit z fronty pÅ™ehrávánÃ"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Znovu naÄÃst metadata"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Odstranit z disku"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Přidat sloupec"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Upravit sloupec"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Odstranit sloupec"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Seskupit dle"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Žádné"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Umělec/Datum/Album"
@@@ -1111,11 -1151,11 +1173,11 @@@ msgstr "Nastavit %s
msgid "Default Audio Device"
msgstr "Výchozà audio zaÅ™ÃzenÃ"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1123,7 -1163,7 +1185,7 @@@
msgid "Adding files..."
msgstr "Přidávajà se soubory..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Inicializuje se..."
@@@ -1136,102 -1176,102 +1198,112 @@@ msgid "Really close the window?
msgstr "Opravdu zavÅ™Ãt okno?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[VÃcenásobné hodnoty] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Klávesa"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Klávesa"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Hodnota"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[VÃcenásobné hodnoty] "
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Zapisujà se tagy..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Název pole"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Jméno:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Název pole nesmà zaÄÃnat : nebo _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Nelze přidat pole"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Pole s tÃmto názvem již existuje, prosÃm, zvolte jiný název."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Přidat pole"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Odstranit pole"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "PoužitÃ: deadbeef [volby] [--] [soubor(y)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Volby:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help or -h Zobrazit nápovÄ›du (tuto zprávu) a ukonÄit\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit ZavÅ™Ãt pÅ™ehrávaÄ\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Zobrazit verzi a ukonÄit\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Zahájit pÅ™ehrávánÃ\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Zastavit pÅ™ehrávánÃ\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pauza pÅ™ehrávánÃ\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Přepnout pauzu\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1239,39 -1279,39 +1311,39 @@@ msgstr "
" --play-pause Spustit pÅ™ehrávánÃ, pokud je zastaveno, jinak pÅ™epnout "
"pauzu\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Dalšà skladba z playlistu\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Předchozà skladba z playlistu\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Náhodná skladba z playlistu\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue PÅ™ipojit soubor(y) do existujÃcÃho playlistu\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
"--gui PLUGIN UrÄÃ, který zásuvný modul GUI bude použit, výchozà je \"GTK2\"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Zapsat zformátovaný název skladby do stdout\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1282,7 -1322,7 +1354,7 @@@ msgstr "
" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
" copy[r]ight, [e]lapsed\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1291,28 -1331,24 +1363,36 @@@ msgstr "
" napÅ™.: --nowplaying \"%%a - %%t\" zapÃÅ¡e \"umÄ›lec - "
"název\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " pro dalšà informace navštivte http://sourceforge.net/"
- "apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "VýchozÃ"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Ano"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "VýchozÃ"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Ano"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Ne"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1337,7 -1373,7 +1417,7 @@@ msgstr "
"Skupina / umělec alba\n"
"VlastnÃ"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1345,7 -1381,7 +1425,7 @@@ msgstr "
"Vlevo\n"
"Vpravo"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1355,7 -1391,7 +1435,7 @@@ msgstr "
"Skladba\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1363,7 -1399,7 +1443,7 @@@ msgstr "
"VzestupnÄ›\n"
"SestupnÄ›"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1371,14 -1407,7 +1451,7 @@@ msgstr "
"2.3 (DoporuÄeno)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Nelze najÃt pixmap soubor: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1391,8 -1420,8 +1464,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "Přidat Audio CD"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1685,8 -1714,8 +1758,8 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "Nakonfigurovat vlastnà pÅ™Ãkazy shellu"
+ msgid "Configure Custom Shell Commands"
+ msgstr ""
#. mpgmad
#: ../translation/extra.c:99
@@@ -1702,35 -1731,40 +1775,40 @@@ msgstr "Upřednostnit emulátor Ken př
msgid "Enable surround"
msgstr "Povolit prostorový zvuk"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Soubor již existuje. Přepsat?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Varovánà konvertoru"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Vyberte enkodér"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Chyba konvertoru"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Převádà se..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Vybrat adresář..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Selhalo ukládánà předvolby enkodéru"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1738,77 -1772,77 +1816,77 @@@ msgstr "
"Ověřte oprávnÄ›nà k adresáři pÅ™edvolby, zvolte jiný název nebo uvolnÄ›te mÃsto "
"na disku"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "Předvolba stejného jména již existuje. Zkuste zvolit jiný název."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Chyba"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Přidat nový enkodér"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Upravit enkodér"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Odstranit předvolbu"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Tato akce odstranà vybranou pÅ™edvolbu. PokraÄovat?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Enkodéry"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Přidat zásuvný modul do řetězce DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Selhalo ukládánà předvolby DSP"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Nová předvolba DSP"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Upravit předvolbu DSP"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "Předvolby DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Výstupnà adresář:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "Zapsat do zdrojové složky skladby"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "Zachovat strukturu adresáře"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Název výstupnÃho souboru:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1818,89 -1852,89 +1896,89 @@@ msgstr "
"PÅ™Ãpona (napÅ™. .mp3) bude pÅ™ipojena automaticky.\n"
"Ponechte pole prázdné pro výchozà (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Enkodér:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "Předvolba DSP:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "PoÄet vláken:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Výstupnà formát vzorku:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Zachovat zdrojový formát"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 bit podepsaný int"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 bit podepsaný int"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 bit podepsaný int"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 bit podepsaný int"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 bit plovoucÃ"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Pokud soubor existuje:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Prompt"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Přepsat"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Upravit předvolbu enkodéru"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Enkodér bez názvu"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "PÅ™Ãpona výstupnÃho souboru:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "NapÅ™. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "PÅ™Ãkazový řádek:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1910,7 -1944,7 +1988,7 @@@ msgstr "
"PÅ™Ãklad: lame - %o\n"
"%i pro vstupnà soubor, %o pro výstupnà soubor, - pro stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1920,66 -1954,72 +1998,72 @@@ msgstr "
"<small>%o - název výstupnÃho souboru\n"
"%i - název doÄasného vstupnÃho souboru</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Metoda:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Roura"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "DoÄasný soubor"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Autor popisku</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "Editor předvolby DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Předvolba DSP bez názvu"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Přidat"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Nelze najÃt pixmap soubor: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2017,27 -2057,27 +2101,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "Vlastnà pÅ™Ãkazy shellu"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "Upravit"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "ZavÅ™Ãt"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "Upravit pÅ™Ãkaz"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "PÅ™Ãkaz:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2049,17 -2089,17 +2133,17 @@@ msgstr "
"spuÅ¡tÄ›na hlavnà aplikace. Může být použito formátovánà názvu. PÅ™Ãklad: xdg-"
"open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "ID:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "Jakýkoliv název, napÅ™Ãklad \"Můj pÅ™Ãkaz shellu\""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
@@@ -2068,57 -2108,57 +2152,57 @@@ msgstr "
"ID pÅ™Ãkazu, mÄ›lo by to být nÄ›co krátkého, napÅ™Ãklad \"youtube_otevÅ™Ãt\". "
"Musà být unikátnÃ."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "Jednotlivé skladby"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "Funguje na jednotlivých skladbách"
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "VÃce skladeb"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "Funguje na vÃce skladbách"
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "MÃstnÃ"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "Funguje na mÃstnÃch souborech"
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "Vzdálený"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "Funguje na vzdálených souborech (např. streamovánà http://)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "Položka by se mÄ›la objevit v hlavnÃm menu"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2126,72 -2166,72 +2210,76 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "PÅ™idat pÅ™Ãkaz"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "Smazat"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr "Tato akce odstranà vybraný pÅ™Ãkaz shellu. PokraÄovat?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "Potvrdit odstranÄ›nÃ"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "ID nesmà zůstat prázdné a musà být unikátnÃ.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "Název nesmà zůstat prázdný.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "PÅ™Ãkaz shellu nesmà zůstat prázdný.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "Neplatné hodnoty"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "Podporované zvukové formáty"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "VÅ¡echny soubory (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "OtevÅ™Ãt soubor(y)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "Přidat soubor(y) do playlistu..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "Přidat složku(y) do playlistu..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "Následovat symlinky"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr "help.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "Smazat soubory z disku"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2199,19 -2239,19 +2287,19 @@@ msgstr "
"Soubory budou ztraceny. PokraÄovat?\n"
"(Tento dialog lze vypnout v nastavenà zásuvného modulu GTKUI)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "NaÄÃst playlist"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "Ostatnà soubory (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "Uložit playlist jako"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "Soubory playlistů DeaDBeeF (*.dbpl)"
@@@ -2245,102 -2285,111 +2333,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr "Nenà nic vybráno."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/da.po
index b39a732,ec72e6b..c1c61eb
--- a/po/da.po
+++ b/po/da.po
@@@ -8,9 -8,9 +8,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Danish (http://www.transifex.com/projects/p/deadbeef-player/"
"language/da/)\n"
"Language: da\n"
@@@ -19,17 -19,17 +25,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Om DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s - ændringslog"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Oversættere af DeaDBeeF"
@@@ -86,44 -86,44 +92,52 @@@ msgstr "Nulstil forforstærkning
msgid "Zero Bands"
msgstr "Nulstil frekvensbånd"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Forhåndsindstillinger"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 dag %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dage %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Stoppet | %d numre | %s samlet afspilningstid"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Pause | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -131,747 -131,774 +145,778 @@@ msgstr "
"%s%s %s| %d Hz | %d bit | %s | %d:%02d / %s | %d numre | %s samlet "
"afspilningstid"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Ny afspilningsliste"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Ny afspilningsliste (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Kunne ikke læse hjælpefil"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Kunne ikke indlæse hjælpefil"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Advarsel"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Fil"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Ã…bn filer"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Tilføj filer"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Tilføj mapper"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Tilføj placering"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Ny afspilningsliste"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Indlæs afspilningsliste"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Gem afspilningsliste"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Afslut"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Rediger"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Ryd"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Vælg alle"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Fravælg alle"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Inverter markering"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Markering"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Fjern"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Beskær"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Find"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Titel"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Nummer"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Kunstner"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Dato"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Tilfældig"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Tilpasset"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Indstillinger"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Vis"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Statusbjælke"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Equalizer"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Afspilning"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Rækkefølge"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Lineær"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Bland numre"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Bland albums"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Gentage"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Rul følger afspilning"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Markør følger afspilning"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Stop efter aktuelle"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Spring til aktuelle nummer"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Hjælp"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Ændringslog"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Om"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "Oversæ_ttere"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Søg"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Stop"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Afspil"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pause"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Forrige"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Næste"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Afspil tilfældig"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Om"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Afslut"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Hjælp"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Nummeregenskaber"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Indstillinger"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Anvend"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Luk"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadata"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Egenskaber"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Titel:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Indtast ny kolonnetitel her"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Type:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Indeks"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Spiller"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Albumomslag"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Kunstner - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Varighed"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Nummer"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Band-/albumkunstner"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Format:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Justering:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Venstre"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Højre"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Afbryd"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_O.k."
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Udvidelsesmodul for uddata:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Uddataenhed:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Konverter altid 8-bits lyd til 16-bit"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Lyd"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Replaygains tilstand:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Deaktiver"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Nummer"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Replaygains niveauskala"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Tilføj filer fra kommandolinje (eller filhåndtering) til afspilningslisten:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Genoptag forrige session ved opstart"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr ""
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Afspilning"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Konfigurer"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr ""
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr ""
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr ""
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Luk minimeringer til statusfelt"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Skjul statusikon"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Titelbjælketekst under afspilning:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Titelbjælketekst når stoppet:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Skjul kontekstmenupunktet »Slet fra disk«"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Overskriv"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Forgrund"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Baggrund"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Farver for søgebjælke/lydstyrkebjælke"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Midt"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Lys"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Mørk"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Base"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Tekst"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Farver for fanebladsfjernelse"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"Overskriv (mister tema for GTK-trævisning, men øger optegningshastigheden)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Lige række"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Ulige række"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Markeret række"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Markeret tekst"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Markør"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Farver på afspilningsliste"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Farver"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Aktiver proxyserver"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Adresse for proxyserver:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Port til proxyserver:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Proxytype:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Brugernavn til proxy:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Adgangskode til proxy:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Netværk"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -879,122 -906,128 +924,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr ""
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr ""
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Udvidelsesmoduler"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "Internetadresse:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr ""
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Skriv ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Skriv ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Skriv APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Fjern ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Fjern ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Fjern APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2-version"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Anbefalet)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1-tegnkodning (standard er iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Skriv ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1002,91 -1035,100 +1053,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Kunster / album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Nummer"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Tilføj til afspilningskø"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Fjern fra afspilningskø"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Genindlæs metadata"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Fjern fra disk"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Tilføj kolonne"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Rediger kolonne"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Fjern kolonne"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Grupper efter"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Ingen"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Kunster/dato/album"
@@@ -1103,11 -1145,11 +1167,11 @@@ msgstr "
msgid "Default Audio Device"
msgstr "Standardlydenhed"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1115,7 -1157,7 +1179,7 @@@
msgid "Adding files..."
msgstr "Tilføjer filer..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Initialiserer..."
@@@ -1128,139 -1170,139 +1192,149 @@@ msgid "Really close the window?
msgstr "Luk vinduet?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Tast"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Tast"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Værdi"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr ""
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Tilvalg:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help eller -h Vis hjælp (denne besked) og afslut\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Afslut afspiller\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Vis versionsinfo og afslut\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Start afspilning\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Stop afspilning\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pause afspilning\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr ""
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Næste sang i afspilningsliste\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Forrige sang i afspilningsliste\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Tilfældig sang i afspilningsliste\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Tilføj filer til eksisterende afspilningsliste\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Vis formateret nummernavn til stdout\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1271,7 -1313,7 +1345,7 @@@ msgstr "
" [l] længde, [n] nummer, [y] år, [c] bemærkning,\n"
" [r] ophavsret, [e] forløbet\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1280,26 -1322,24 +1354,36 @@@ msgstr "
" f.eks.: --nowplaying \"%%a - %%t\" skal vise »kunstner "
"- titel«\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Standard"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Ja"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Standard"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Ja"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Nej"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1314,7 -1354,7 +1398,7 @@@
"Custom"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1322,7 -1362,7 +1406,7 @@@ msgstr "
"Venstre\n"
"Højre"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1332,13 -1372,13 +1416,13 @@@ msgstr "
"Nummer\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1346,14 -1386,7 +1430,7 @@@ msgstr "
"2.3 (Anbefalet)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Kunne ikke finde pixmapfil: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1366,7 -1399,7 +1443,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1659,7 -1692,7 +1736,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1676,111 -1709,116 +1753,116 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr ""
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr ""
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr ""
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr ""
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr ""
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr ""
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr ""
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr ""
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr ""
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr ""
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1788,89 -1826,89 +1870,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr ""
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr ""
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr ""
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr ""
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr ""
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1878,7 -1916,7 +1960,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1886,66 -1924,72 +1968,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr ""
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr ""
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr ""
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr ""
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr ""
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr ""
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr ""
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Tilføj"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Kunne ikke finde pixmapfil: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1973,27 -2017,27 +2061,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2002,74 -2046,74 +2090,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2077,90 -2121,90 +2165,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2187,102 -2231,111 +2279,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/de.po
index e2d7118,2739c30..37d3587
--- a/po/de.po
+++ b/po/de.po
@@@ -3,17 -3,18 +3,31 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
++<<<<<<< HEAD
+# Jan D. Behrens <zykure at web.de>, 2013
+# wander <wander.homer at gmail.com>, 2013
+# wander <wander.homer at gmail.com>, 2013
+# Jan D. Behrens <zykure at web.de>, 2013
++=======
+ # Zykure <zykure at web.de>, 2013
+ # Wander <wander.homer at gmail.com>, 2013
+ # Wander <wander.homer at gmail.com>, 2013
+ # Zykure <zykure at web.de>, 2013
+ # Zykure <zykure at web.de>, 2013
++>>>>>>> upstream/0.6.2
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:49+0000\n"
+"Last-Translator: wander <wander.homer at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: German (http://www.transifex.com/projects/p/deadbeef-player/"
"language/de/)\n"
"Language: de\n"
@@@ -22,17 -23,17 +36,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Ãœber DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s ChangeLog"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF Ãœbersetzer"
@@@ -89,795 -90,820 +103,844 @@@ msgstr "Vorverstärkung zurücksetzen
msgid "Zero Bands"
msgstr "Equalizer zurücksetzen"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Voreinstellungen"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 Tag %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d Tage %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Angehalten | %d Titel | %s gesamte Spielzeit"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Pausiert | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d Titel | %s gesamte Spielzeit"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Neue Wiedergabeliste"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Neue Wiedergabeliste (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Wiedergabeliste mit Reitern"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Wiedergabeliste"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "Splitter (oben/unten)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "Splitter (links/rechts)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Reiter für Wiedergabelisten"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Auswahl-Eigenschaften"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Album Artwork"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "Oszilloskop"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "Spektrum"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Knopf"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Fehler beim Lesen der Hilfedatei"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Fehler beim Laden der Hilfedatei"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- "DeaDBeeF führt gerade Aufgaben im Hintergrund durch. Wenn Sie jetzt beenden, "
- "werden diese abgebrochen oder beendet. Dies könnte zu Datenverlust führen."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "Wollen Sie trotzdem beenden?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Warnung"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Datei"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "Dateien ö_ffnen"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Dateien hinzufügen"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Verzeichnisse hinzufügen"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Ort hinzufügen"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Neue Wiedergabeliste"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Wiedergabeliste laden"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Wiedergabeliste speichern"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Beenden"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Bearbeiten"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Löschen"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Alles auswählen"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Alles abwählen"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Auswahl umkehren"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Auswahl"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Entfernen"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Abschneiden"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "Suchen"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Sortiere nach"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Titel"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Track-Nummer"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Künstler"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Datum"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Zufällig"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Benutzerdefiniert"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Einstellungen"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Ansicht"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Statusleiste"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Equalizer"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "Designmodus"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Wiedergabe"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Reihenfolge"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Linear"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Track-Shuffle"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Album-Shuffle"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Wiederholen"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Wiederhole alles"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Wiederhole einzelnen Track"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Keine Wiederholung"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Bildlauf folgt Wiedergabe"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Mauszeiger folgt Wiedergabe"
++<<<<<<< HEAD
+#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Stop after current"
+msgstr "Nach aktuellem Titel anhalten"
++=======
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
++>>>>>>> upstream/0.6.2
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Zu aktuellem Titel springen"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Hilfe"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_ChangeLog"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Info"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Ãœbersetzer"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Suche"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Stopp"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Abspielen"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Anhalten"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Vorheriges"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Nächstes"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Zufälliges Abspielen"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Info"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Beenden"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Hilfe"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Titeleigenschaften"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "Ort:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Einstellungen"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "A_nwenden"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "S_chließen"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadaten"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Eigenschaften"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Titel:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Neuen Spaltentitel eingeben"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Typ:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Index"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Wiedergabe"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Album Artwork"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Künstler - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Dauer"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Track-Nummer"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Band / Album-Künstler"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Format:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Ausrichtung:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Linksbündig"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Rechtsbündig"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Abbrechen"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Ausgabeplugin:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Ausgabegerät:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Immer 8-bit Audio nach 16-bit konvertieren"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr "Immer 16-bit Audio nach 24-bit konvertieren"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Audio"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Replaygain-Modus:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Deaktivieren"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Titel"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Replaygain-Ausschlagschutz"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Replaygain-Vorverstärkung:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Globale Vorverstärkung:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Datein beim Hinzufügen von Kommandozeile (oder Dateimanager) an Liste "
"anhängen:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Beim Start letzte Sitzung wiederherstellen"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr ""
"Dateien innerhalb von Archiven beim Hinzufügen von Verzeichnissen auslassen"
++<<<<<<< HEAD
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
+msgid "Auto-reset \"Stop after current\""
+msgstr "\"Nach aktuellem Titel anhalten\" automatisch zurücksetzen"
++=======
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
++>>>>>>> upstream/0.6.2
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Wiedergabe"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Einstellungen"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP Voreinstellung"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Laden"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Beim Schließen minimieren"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Systemleisten-Icon verstecken"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "Erkennung und Rekodierung von CP1251 (russisch)"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Erkennung und Rekodierung von CP936 (chinesisch)"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Aktualisierungsrate der Benutzeroberfläche (Ereignisse pro Sekunde):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Fenstertitel beim Abspielen:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Fenstertitel wenn angehalten:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "GUI-Plugin (Änderung benötigt Neustart):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr "Player"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr "Wiedergabeliste mit Mittelklick schließen"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr "Aktuellen Titel hervorheben"
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Eintrag \"Vom Datenträger entfernen\" im Kontextmenü verstecken"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
"Wiedergabeliste beim Hinzufügen einzelner Verzeichnisse automatisch benennen"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr "Spalten automatisch an die Fenstergröße anpassen"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "GUI/Diverses"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Ãœberschreiben"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Vordergrund"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Hintergrund"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Farben von Suchleiste und Lautstärkeregler"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Mittel"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Hell"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Dunkel"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Basis"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Text"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Farben der Reiterleiste"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "Ãœberschreiben (beschleunigt die Darstellung)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Gerade Zeile"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Ungerade Zeile"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Ausgewählte Zeile"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Ausgewählter Text"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Mauszeiger"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Farben der Wiedergabeliste"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Farben"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Proxyserver aktivieren"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Adresse des Proxyservers:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Port des Proxyservers:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Art des Proxyservers:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Benutzername für Proxyserver:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Passwort für Proxyserver:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "HTTP User Agent:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "Bearbeite Zuordnung von Inhalts-Typen "
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Netzwerk"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr "Zugeordnete Hotkeys:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr "Aktion:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<Nicht gesetzt>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr "Tastenkombination:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Globaler Hotkey"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -889,122 -915,128 +952,128 @@@ msgstr "
"Mit \"Zurücksetzen\" können diese wieder rückgängig\n"
"gemacht werden."
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr "_Vorgabewerte"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "Hotkeys"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Version: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Copyright"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Erweiterungen"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "Gruppiere nach ..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "Sortiere nach ..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Format"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Aufsteigend"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Absteigend"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Auswahl des DSP-Plugins"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Erweiterung"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Einstellungen für den Tag-Editor"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Schreibe ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Schreibe ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "APEv2 schreiben"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "ID3v2 entfernen"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "ID3v1 entfernen"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "APEv2 entfernen"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 Version"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (empfohlen)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 Zeichensatz (Vorgabe ist iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Schreibe ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "Zuordnung von Inhalts-Typen"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1016,91 -1048,100 +1085,104 @@@ msgstr "
"den Inhaltstyp \"audio/x-mpeg\" haben, und werden von DeaDBeeFs eigener "
"Erweiterung \"stdmpg\" oder der Erweiterung \"ffmpeg\" dekodiert."
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "Vorgabewerte"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "Inhalts-Typ:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "Erweiterungen:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr "Knopf-Einstellungen"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr "Farbe:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr "Textfarbe:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr "Symbol:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr "Titel:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr "Aktion auswählen"
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Künstler / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Track-Nr."
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Zur Warteschlange hinzufügen"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Von Warteschlange entfernen"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Metadaten neu laden"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Vom Datenträger entfernen"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Spalte hinzufügen"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Spalte bearbeiten"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Spalte entfernen"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr "Gruppen beim Scrollen fixieren"
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Gruppieren nach"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Nichts"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Künstler/Datum/Album"
@@@ -1117,11 -1158,11 +1199,11 @@@ msgstr "%s konfigurieren
msgid "Default Audio Device"
msgstr "Standard Ausgabegerät"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr "Änderungen an den Hotkey-Einstellungen wurde nicht gespeichert"
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr "Wollen Sie sicher ohne Speichern fortfahren?"
@@@ -1129,7 -1170,7 +1211,7 @@@
msgid "Adding files..."
msgstr "Dateien hinzufügen..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Initialisiere..."
@@@ -1142,131 -1183,131 +1224,141 @@@ msgid "Really close the window?
msgstr "Möchten Sie das Fenster wirklich schließen?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Mehrere Werte] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Schlüssel"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Schlüssel"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Wert"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[Mehrere Werte]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Speichere Tags..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Feldname"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Name:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Feldnamen dürfen nicht mit : oder _ beginnen"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Kann Feld nicht hinzufügen"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
"Ein Feld mit diesem Namen existiert bereits, bitte einen anderen Name wählen."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Feld hinzufügen"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Feld entfernen"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "Benutzung: deadbeef [Optionen] [--] [Datei(en)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Optionen:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help oder -h Hilfe (diese Meldung) anzeigen und beenden\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Player beenden\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Versionsinformationen anzeigen und beenden\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Wiedergabe starten\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Wiedergabe beenden\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Wiedergabe pausieren\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Wiedergabe umschalten (Play/Pause)\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
" --play-pause Wiedergabe starten falls angehalten, sonst pausieren\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Nächster Titel in der Wiedergabeliste\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Vorheriger Titel in der Wiedergabeliste\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Zufälliger Titel in der Wiedergabeliste\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr ""
" --queue Datei(en) an bestehende Wiedergabeliste anhängen\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
@@@ -1274,13 -1315,13 +1366,13 @@@ msgstr "
"--gui PLUGIN Gibt an welches GUI-Plugin benutzt werden soll, Standard ist "
"\"GTK2\"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
" --nowplaying FMT Formatierten Tracknamen auf Standardausgabe schreiben\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1291,7 -1332,7 +1383,7 @@@ msgstr "
" [l]änge, Titel[n]ummer, [y]Jahr, [c]Kommentar,\n"
" copy[r]ight, [e]verstrichen\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1300,28 -1341,24 +1392,36 @@@ msgstr "
" z.B.: --nowplaying \"%%a - %%t\" sollte \"Artist - "
"Titel\" ausgeben\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- "für mehr Informationen siehe http://sourceforge.net/apps/mediawiki/deadbeef/"
- "index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Standard"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Ja"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Standard"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Ja"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Nein"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1347,7 -1384,7 +1447,7 @@@ msgstr "
"Band / Album-Künstler\n"
"Benutzerdefiniert"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1355,7 -1392,7 +1455,7 @@@ msgstr "
"Links\n"
"Rechts"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1365,7 -1402,7 +1465,7 @@@ msgstr "
"Track\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1373,7 -1410,7 +1473,7 @@@ msgstr "
"Aufsteigend\n"
"Absteigend"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1381,14 -1418,7 +1481,7 @@@ msgstr "
"2.3 (Empfohlen)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Pixmap-Datei nicht gefunden: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1401,8 -1431,8 +1494,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "Audio-CD hinzufügen"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1694,8 -1724,8 +1787,8 @@@ msgstr "Automatische Samplerate (übers
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "Benutzerdefinierte Shell-Kommandos"
+ msgid "Configure Custom Shell Commands"
+ msgstr ""
#. mpgmad
#: ../translation/extra.c:99
@@@ -1712,35 -1742,40 +1805,40 @@@ msgstr "
msgid "Enable surround"
msgstr "Aktiviere Surround-Sound"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Die Datei existiert bereits. Ãœberschreiben?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Converter: Warnung"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Bitte einen Encoder auswählen"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Converter: Fehler"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Konvertiere..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Verzeichnis wählen..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Fehler beim Speichern des Encoder-Profil"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1748,79 -1783,79 +1846,79 @@@ msgstr "
"Bitte Zugriffsrechte auf das Verzeichnis prüfen, einen anderen Titel wählen "
"oder freien Platz auf der Festplatte schaffen"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
"Ein Profil mit diesem Namen existiert bereits. Bitte einen anderen Titel "
"wählen."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Fehler"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Neuen Encoder hinzufügen"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Encoder bearbeiten"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Profil entfernen"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Diese Aktion wird das gewählte Profil löschen. Sind Sie sicher?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Encoder"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Plugin in DSP-Kette einfügen"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Fehler beim Speichern des DSP-Profils"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Neues DSP-Profil"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "DSP-Profil bearbeiten"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP-Profile"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Zielverzeichnis:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "In Verzeichnis der Quelldatei schreiben"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "Verzeichnisstruktur beibehalten"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Dateiname:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1830,89 -1865,89 +1928,89 @@@ msgstr "
"Erweiterung (z.B. .mp3) wird automatisch angehängt.\n"
"Feld leer lassen um Standardwert zu verwenden (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Encoder:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP-Profil:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Thread-Anzahl:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Ausgabe-Sampleformat:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Format der Eingangsdatei verwenden"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 bit signed int"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 bit signed int"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 bit signed int"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 bit signed int"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 bit float"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Falls Datei bereits existiert:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Nachfragen"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Ãœberschreiben"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Profil laden"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Neuer Encoder"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Endung der Zieldatei:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Z.B. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Kommandozeile:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1922,7 -1957,7 +2020,7 @@@ msgstr "
"Beispiel: lame - %o\n"
"%i für Eingabedatei, %o für Zieldatei, - für stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1932,66 -1967,72 +2030,72 @@@ msgstr "
"<small>%o - Name der Zieldatei\n"
"%i - Name der temporären Eingabedatei</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Methode:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Pipe"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Temporäre Datei"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Tags schreiben</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "DSP-Profileditor"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Neues DSP-Profil"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Hinzufügen"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Pixmap-Datei nicht gefunden: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2029,27 -2070,27 +2133,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "Benutzerdefinierte Shell-Kommandos"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "Bearbeiten"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "Schließen"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "Kommando bearbeiten"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "Kommando:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2061,17 -2102,17 +2165,17 @@@ msgstr "
"Anwendung gestartet wurde. Titel-Formatierung kann benutzt werden. Beispiel: "
"xdg-open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "ID:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "Beliebiger Name, zum Beispiel \"Mein Shell-Command\""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
@@@ -2080,57 -2121,57 +2184,57 @@@ msgstr "
"Befehls-ID, normalerweise sollte es eine kurze Bezeichnung sein, zum "
"Beispiel \"youtube_open\". Die Bezeichnung muss eindeutig sein."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "Einzelne Tracks"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "Funktioniert mit einzelnem Track."
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "Mehrere Tracks"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "Funktioniert mit mehreren Tracks."
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "Lokale Dateien"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "Funktioniert mit lokalen Dateien."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "Entfernte Dateien"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "Funktioniert mit entfernten Dateien (z.B. http:// Streams)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr "Allgemein (Hauptmenü)"
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "Element soll im Hauptmenü erscheinen"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2141,73 -2182,73 +2245,77 @@@ msgstr "
"sicher, dass der Titel den Menüpfad in Englisch enthält. Zum Beispiel: "
"\"File/My Command\"</small>"
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "Kommando hinzufügen"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "Löschen"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
"Diese Aktion wird das ausgewählte Shell-Kommando löschen. Sind Sie sicher?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "Bestätige Entfernen"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "ID darf nicht leer und muss eindeutig sein.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "Titel darf nicht leer sein.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "Shell-Kommando darf nicht leer sein.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "Ungültige Werte"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "Unterstützte Sound-Formate"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "Alle Dateien (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "Öffne Datei(en)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "Datei(en) zu Wiedergabeliste hinzufügen..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "Ordner zu Wiedergabeliste hinzufügen..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "Folge symbolischen Links"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr "help.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "Lösche von Datenträger"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2215,19 -2256,19 +2323,19 @@@ msgstr "
"Dateien werden verloren gehen. Fortführen?\n"
"(Dieser Dialog kann in den Einstellung des GTKUI-Plugins deaktiviert werden)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "Wiedergabeliste laden"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "Andere Dateien (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "Speichere Wiedergabeliste als"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "DeaDBeeF playlist files (*.dbpl)"
@@@ -2261,102 -2302,111 +2369,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr "Nichts ist ausgewählt."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr "Ersetze mit..."
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr "Einfügen..."
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr "Ausschneiden"
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr "Kopieren"
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr "Einfügen"
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr "Mehrere Widgets dieser Art werden nicht unterstützt"
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr "Position sperren"
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr "Reiter nach links bewegen"
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr "Reiter nach rechts bewegen"
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr "Reiter entfernen"
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr "Reiter umbennen"
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr "Neuen Reiter hinzufügen"
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr "Zeige Spaltentitel"
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr "Erweitere die Box um 1 Element"
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr "Reduziere die Box um 1 Element"
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr "Gleichmäßig"
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr "Erweitern"
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr "Ausfüllen"
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr "Ersetze mit..."
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr "Einfügen..."
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr "Ausschneiden"
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr "Kopieren"
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr "Einfügen"
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr "Mehrere Widgets dieser Art werden nicht unterstützt"
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr "Position sperren"
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr "Reiter nach links bewegen"
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr "Reiter nach rechts bewegen"
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr "Reiter entfernen"
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr "Reiter umbennen"
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr "Neuen Reiter hinzufügen"
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr "Zeige Spaltentitel"
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr "Erweitere die Box um 1 Element"
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr "Reduziere die Box um 1 Element"
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr "Gleichmäßig"
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr "Erweitern"
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr "Ausfüllen"
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr "Bearbeite Knopf"
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr "Wiedergabeliste editieren"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr "Wiedergabeliste umbenennen"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr "Wiedergabeliste entfernen"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr "Neue Wiedergabeliste"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr "Name"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr "Wiedergabelisten-Browser"
diff --combined po/el.po
index 4d55f32,54090b5..8aa0d66
--- a/po/el.po
+++ b/po/el.po
@@@ -10,9 -10,9 +10,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Greek (http://www.transifex.com/projects/p/deadbeef-player/"
"language/el/)\n"
"Language: el\n"
@@@ -21,17 -21,17 +27,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Σχετικά με το DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "ΑλλαγÎÏ‚ DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "ΜεταφÏαστÎÏ‚ του DeaDBeeF"
@@@ -88,44 -88,44 +94,52 @@@ msgstr "Μηδενισμός Î Ïοεν
msgid "Zero Bands"
msgstr "Μηδενισμός Ζωνών"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Î ÏοÏυθμίσεις"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 μÎÏα %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d μÎÏες %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "ΣταματημÎνο | %d κομμάτια | %s συνολικός χÏόνος αναπαÏαγωγής"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Μονοφωνικό"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Μονοφωνικό"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "ΣτεÏεοφωνικό"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "ΠαÏση | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -133,752 -133,776 +147,780 @@@ msgstr "
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d κομμάτια | %s συνολικός "
"χÏόνος αναπαÏαγωγής"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "ÎÎα Λίστα ΑναπαÏαγωγής"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "ÎÎα Λίστα ΑναπαÏαγωγής (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Λίστα αναπαÏαγωγής με καÏÏ„Îλες"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Λίστα ΑναπαÏαγωγής"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "ΚαÏÏ„Îλες λιστών αναπαÏαγωγής"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Ιδιότητες επιλογής"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Î Ïοβολή εξώφυλλων"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Κουμπί"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Αποτυχία κατά την ανάγνωση του αÏχείου βοήθειας"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Αποτυχία κατά τη φόÏτωση του αÏχείου βοήθειας"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- "Ο αναπαÏαγωγÎας εκτελεί εÏγασίες στο υπόβαθÏο. Αν τεÏματίσετε Ï„ÏŽÏα, οι "
- "εÏγασίες θα ακυÏωθοÏν ή θα διακοποÏν. Αυτό μποÏεί να καταλήξει σε απώλεια "
- "δεδομÎνων."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "ΘÎλετε Ï€Ïαγματικά να τεÏματίσετε την εφαÏμογή;"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Î Ïοειδοποίηση"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_ΑÏχείο"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Άνοιγμα αÏχείου(-ων)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Î Ïοσθήκη αÏχείου(-ων)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Î Ïοσθήκη φακÎλου(-ων)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Î Ïοσθήκη τοποθεσίας"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "ÎÎα λίστα αναπαÏαγωγής"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "ΦόÏτωση λίστας αναπαÏαγωγής"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Αποθήκευση λίστας αναπαÏαγωγής"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Έξοδος"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_ΕπεξεÏγασία"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_ΚαθαÏισμός"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Επιλογή όλων"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Αποεπιλογή όλων"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "ΑναστÏοφή επιλογής"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "ΕπιλεγμÎνο"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "ΑφαίÏεση"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "ΠεÏικοπή"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Αναζήτηση"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Ταξινόμηση κατά"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Τίτλος"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "ΑÏιθμός κομματιοÏ"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Άλμπουμ"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "ΚαλλιτÎχνης"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "ΗμεÏομηνία"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Τυχαία"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "ΑυτοσχÎδιο"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Ρυθμίσεις"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Εμφανίση"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "ΜπάÏα κατάστασης"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ισοσταθμιστής"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "ΛειτουÏγία σχεδίασης"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "Α_ναπαÏαγωγή"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "ΣειÏά"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "ΓÏαμμικά"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Ανακάτεμα κομματιών"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Ανακάτεμα άλμπουμ"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Επανάληψη"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Επανάληψη όλων"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Επανάληψη ενός Ï„ÏαγουδιοÏ"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Îα μην γίνει επανάληψη"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Η κÏλιση ακολουθεί την αναπαÏαγωγή"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Ο δείκτης Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯ την αναπαÏαγωγή"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Διακοπή μετά το Ï„ÏÎχον"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Μεταπήδηση στο Ï„ÏÎχον κομμάτι"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Βοήθεια"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_ΑλλαγÎÏ‚"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Σχετικά"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_ΜεταφÏαστÎÏ‚"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Αναζήτηση"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Διακοπή"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "ΑναπαÏαγωγή"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "ΠαÏση"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Î ÏοηγοÏμενο"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Επόμενο"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "ΑναπαÏαγωγή τυχαίου"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Σχετικά"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Έξοδος"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Βοήθεια"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Ιδιότητες ΚομματιοÏ"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "Τοποθεσία:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "ΕπιλογÎÏ‚"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_ΕφαÏμογή"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Κλείσιμο"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "ΜεταδεδομÎνα"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Ιδιότητες"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Τίτλος:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Εισαγωγή νÎου τίτλου για τη στήλη"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "ΤÏπος"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "ΑÏιθμός αντικειμÎνου"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "ΑναπαÏαγωγή"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "ΣχÎδιο άλπουμ"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "ΚαλλιτÎχνης - Άλμπουμ"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "ΔιάÏκεια"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "ΑÏιθμός ΚομματιοÏ"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "ΣυγκÏότημα / ΚαλλιτÎχνης άλμπουμ"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "ΜοÏφή:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Στοίχιση:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "ΑÏιστεÏά"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Δεξιά"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_ΆκυÏο"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_Εντάξει"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Î Ïόσθετο εξόδου:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Συσκευή εξόδου:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Îα γίνεται πάντα μετατÏοπή του ήχου 8 bit σε 16 bit"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr "Îα γίνεται πάντα μετατÏοπή του ήχου 16 bit σε 24 bit"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Ήχος"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "ΛειτουÏγία Replaygain:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "ΑνενεÏγό"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Κομμάτι"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "ΚοÏυφή κλίμακας Replaygain"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Î Ïοενίσχυση Replaygain:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Καθολική Ï€Ïοενίσχυση"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Î Ïοσθήκη αÏχείων από την γÏαμμή εντολών (ή το διαχειÏιστή αÏχείων) σε αυτή "
"τη λίστα αναπαÏαγωγής:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "ΣυνÎχεια Ï€ÏοηγοÏμενης συνεδÏίας στην εκκίνηση"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Îα μη γίνεται Ï€Ïοσθήκη από αÏχειοθήκες κατά την Ï€Ïοσθήκη φακÎλων"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "ΑναπαÏαγωγή"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "ΡÏθμιση"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Î ÏοκαθοÏισμÎνες Ρυθμίσεις Αλυσίδας DSP"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_ΦόÏτωση"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Ελαχιστοποίηση στο πλαίσιο συστήματος στο κλείσιμο"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "ΑπόκÏυψη εικονιδίου στο πλαίσιο συστήματος"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Ρυθμός ανανÎωσης γÏαφικής διεπαφής (φοÏÎÏ‚ το δευτεÏόλεπτο):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Τίτλος παÏαθÏÏου κατά την αναπαÏαγωγή:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Τίτος παÏαθÏÏου κατά τη διακοπή:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "Î Ïόσθετο γÏαφικής διεπαφής (αλλαγή απαιτεί επανεκκίνηση):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr "ΑναπαÏαγωγÎας"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr "Κλείσιμο λιστών αναπαÏαγωγής με το μÎσο πλήκτÏο του ποντικιοÏ"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "ΑπόκÏυψη του Î¼ÎµÎ½Î¿Ï \"ΔιαγÏαφή από το δίσκο\""
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
"Αυτόματη απόδοση ονόματος στις λίστες αναπαÏαγωγής όταν φοÏτώνεται Îνας "
"κατάλογος"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "ΠαÏάκαμψη"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Î Ïοσκήνιο"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "ΠαÏασκήνιο"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "ΧÏώματα μπάÏας μετατόπισης/ήχου"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "ÎœÎση"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Φωτεινό"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Σκοτεινό"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Βάση"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Κείμενο"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "ΧÏώματα στο χώÏο καÏτελών"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "ΠαÏάκαμψη (χάνει το θÎμα GTK treeview, αλλά επιταχÏνει την απόδοση)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Ζυγή σειÏά"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Μονή σειÏά"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "ΕπιλεγμÎνη σειÏά"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "ΕπιλεγμÎνο κείμενο"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Δείκτης ποντικιοÏ"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "ΧÏώματα λίστας αναπαÏαγωγής"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "ΧÏώματα"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "ΕνεÏγοποίηση Proxy Server"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "ΔιεÏθυνση Proxy Server:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Î ÏŒÏτα Proxy Server:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "ΤÏπος Proxy:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Όνομα χÏήστη Proxy:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Κωδικός Proxy:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "ΕπεξεÏγασία ΤÏπων ΠεÏιεχομÎνου"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Δίκτυο"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr "Î ÏοσδιοÏισμÎνες ΣυντομεÏσεις:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr "ΕνÎÏγεια:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<Δεν Îχει οÏιστεί>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr "Συνδυασμός πλήκτÏων:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Γενική συντόμευση"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -886,122 -910,128 +928,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr "_Î ÏοκαθοÏισμÎνα"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "ΣυντομεÏσεις"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Έκδοση:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Πνευματικά δικαιώματα"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Î Ïόσθετα"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "Ομαδοποίηση Κατά ..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "Ταξινόμηση κατά ..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "ΜοÏφή"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "ΑÏξουσα σειÏά"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Φθίνουσα σειÏά"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "ΕπιλÎξτε Î Ïόσθετο DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Î Ïόσθετο"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "ΕπιλογÎÏ‚ ΣυγγÏαφÎα Ετικετών"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ΕγγÏαφή ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ΕγγÏαφή ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "ΕγγÏαφή APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "ΑφαίÏεση ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "ΑφαίÏεση ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "ΑφαίÏεση APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "Έκδοση ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Î Ïοτείνεται)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 κωδικοποίηση χαÏακτήÏων (Ï€Ïοεπιλογή είναι iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ΕγγÏαφή ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "Επιλογή ΤÏπων ΠεÏιεχομÎνου"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1009,91 -1039,100 +1057,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "ΕπαναφοÏά στα Ï€ÏοκαθοÏισμÎνα"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "ΤÏπος πεÏιεχομÎνου:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "Î Ïόσθετα:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr "Ιδιότητες κουμπιοÏ"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr "ΧÏώμα:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr "ΧÏώμα κειμÎνου:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr "Εικονίδιο:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr "ΕτικÎτα:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr "Επιλογή ενÎÏγειας"
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "ΚαλλιτÎχνης / Άλμπουμ"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "ΑÏ. ΚομματιοÏ"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Î Ïοσθήκη στην ουÏά αναπαÏαγωγής"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "ΑφαίÏεση από την ουÏά αναπαÏαγωγής"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "ΕπαναφόÏτωση μεταδεδομÎνων"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "ΑφαίÏεση από τον δίσκο"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Î Ïοσθήκη στήλης"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "ΕπεξεÏγασία στήλης"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "ΑφαίÏεση στήλης"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Ομαδοποίηση κατά"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Καμία"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "ΚαλλιτÎχνης/ΗμεÏομηνία/Άλμπουμ"
@@@ -1110,11 -1149,11 +1171,11 @@@ msgstr "ΡÏθμιση %s
msgid "Default Audio Device"
msgstr "Î ÏοεπιλεγμÎνη συσκευή ήχου"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1122,7 -1161,7 +1183,7 @@@
msgid "Adding files..."
msgstr "Î Ïοσθήκη αÏχείων"
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "ΑÏχικοποίηση..."
@@@ -1135,104 -1174,104 +1196,114 @@@ msgid "Really close the window?
msgstr "Είστε σίγουÏοι πως θÎλετε να κλείσετε το παÏάθυÏο;"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[ΠολλαπλÎÏ‚ τιμÎÏ‚]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "ΠλήκτÏο"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "ΠλήκτÏο"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Τιμή"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[ΠολλαπλÎÏ‚ τιμÎÏ‚]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "ΕγγÏαφή ετικετών..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Όνομα πεδίου"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Όνομα:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Τα πεδία ονόματος δεν Ï€ÏÎπει να ξεκινοÏν με : ή _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Αποτυχία Ï€Ïοσθήκης πεδίου"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
"ΥπάÏχει ήδη πεδίο με αυτό το όνομα, παÏακαλώ Ï€Ïοσπαθήστε με Îνα διαφοÏετικό "
"όνομα."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Î Ïοσθήκη πεδίου"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "ΑφαίÏεση πεδίου"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "ΧÏήση: deadbeef [επιλογÎÏ‚] [--] [αÏχείο(-α)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "ΕπιλογÎÏ‚:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help ή -h Εμφάνιση κειμÎνου βοήθειας (αυτό το κείμενο) και Îξοδος\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr "--quit Έξοδος\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr "--version Εμφάνιση πληÏοφοÏιών Îκδοσης και Îξοδος\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr "--play Εκκίνηση αναπαÏαγωγής\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr "--stop Διακοπή αναπαÏαγωγής\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr "--pause ΠαÏση αναπαÏαγωγής\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr "--toggle-pause Εναλλαγή παÏσης\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1240,27 -1279,27 +1311,27 @@@ msgstr "
"--play-pause Εκκίνηση αναπαÏαγωγής αν είναι σταματημÎνο, αλλιώς εναλλαγή "
"παÏσης\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr "--next Επόμενο κομμάτι στη λίστα αναπαÏαγωγής\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr "--prev Î ÏοηγοÏμενο κομμάτι στη λίστα αναπαÏαγωγής\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr "--random Τυχαίο κομμάτι στη λίστα αναπαÏαγωγής\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr "--queue Î ÏοσάÏτηση αÏχείου(-ων) στην υπάÏχουσα λίστα αναπαÏαγωγής\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
@@@ -1268,12 -1307,12 +1339,12 @@@ msgstr "
"--gui PLUGIN ΕπιλÎγει ποιό Ï€Ïόσθετο γÏαφικής διεπαφής θα χÏησιμοποιηθεί, το "
"Ï€ÏοκαθοÏισμÎνο είναι το \"GTK2\"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr "--nowplaying FMT Εμφάνιση μοÏφοποιημÎνου ονόματος κομματιοÏ\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1284,35 -1323,31 +1355,43 @@@ msgstr "
" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
" copy[r]ight, [e]lapsed\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
"- title\"\n"
msgstr "π.χ.: --nowplaying \"%%a - %%t\" θα εμφανίσει \"artist - title\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- "για πεÏισσότεÏες πληÏοφοÏίες, δείτε το http://sourceforge.net/apps/mediawiki/"
- "deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Î Ïοεπιλογή"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Îαί"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Î Ïοεπιλογή"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Îαί"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Όχι"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1338,7 -1373,7 +1417,7 @@@ msgstr "
"ΚαλλιτÎχνης ΣυγκÏοτήματος / Άλμπουμ\n"
"Î ÏοσαÏμοσμÎνο"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1346,7 -1381,7 +1425,7 @@@ msgstr "
"ΑÏιστεÏα\n"
"Δεξιά"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1356,7 -1391,7 +1435,7 @@@ msgstr "
"Κομμάτι\n"
"Άλμπουμ"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1364,7 -1399,7 +1443,7 @@@ msgstr "
"ΑÏξουσα σειÏά\n"
"Φθίνουσα σειÏά"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1372,14 -1407,7 +1451,7 @@@ msgstr "
"2.3 (Î Ïοτείνεται)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Δε βÏÎθηκε το αÏχείο pixmap: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1392,8 -1420,8 +1464,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "Î Ïοσθήκη CD μουσικής"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1685,8 -1713,8 +1757,8 @@@ msgstr "Αυτόματη δειγματ
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "ΡÏθμιση Ï€ÏοσαÏμοσμÎνων εντολών κελÏφους"
+ msgid "Configure Custom Shell Commands"
+ msgstr ""
#. mpgmad
#: ../translation/extra.c:99
@@@ -1702,35 -1730,40 +1774,40 @@@ msgstr "
msgid "Enable surround"
msgstr "ΕνεÏγοποίηση πεÏιφεÏÎµÎ¹Î±ÎºÎ¿Ï Î®Ï‡Î¿Ï…"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Το αÏχείο υπάÏχει ήδη. Îα αντικατασταθεί;"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Î Ïοειδοποίηση μετατÏοπής"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "ΠαÏακαλώ επιλÎξτε κωδικοποιητή "
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Σφάλμα μετατÏοπÎα"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "ΜετατÏοπή..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Επιλογή φακÎλου"
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Αποτυχία αποθήκευσης Ï€ÏοÏÏθμισης κωδικοποιητή "
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1738,80 -1771,80 +1815,80 @@@ msgstr "
"ΕλÎγξτε τα δικαιώματα του φακÎλου Ï€ÏοÏυθμίσεων, δοκιμάστε με Îνα διαφοÏετικό "
"όνομα, ή ελευθεÏώστε χώÏο στο σκληÏÏŒ δίσκο"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
"ΥπάÏχει ήδη μια Ï€ÏοÏÏθμιση με αυτό το όνομα. Δοκιμάστε να διαλÎξετε Îνα "
"διαφοÏετικό όνομα."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Σφάλμα"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Î Ïοσθήκη κωδικοποιητή"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "ΕπεξεÏγασία κωδικοποιητή"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "ΑφαίÏεση Ï€ÏοÏÏθμισης"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
"Αυτή η ενÎÏγεια θα διαγÏάψει την επιλεγμÎνη Ï€ÏοÏÏθμιση. Είστε σίγουÏοι;"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "ΚωδικοποιητÎÏ‚"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Î Ïοσθήκη Ï€Ïόσθετου στην αλυσίδα DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Αποτυχία αποθήκευσης Ï€ÏοÏÏθμισης DSP"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "ÎÎα Î ÏοÏÏθμιση DSP"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "ΕπεξεÏγασία Î ÏοÏÏθμισης DSP"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "Î ÏοÏυθμίσεις DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Φάκελος εξόδου:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Όνομα αÏχείου εξόδου:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1821,89 -1854,89 +1898,89 @@@ msgstr "
"Η επÎκταση (Ï€.χ. .mp3) θα Ï€Ïοστεθεί αυτόματα.\n"
"Αφήστε το πεδίο κενό για την Ï€Ïοεπιλογή (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Κωδικοποιητής:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "ΡÏθμιση DSP:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "ΑÏιθμός νημάτων:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "ΜοÏφή δειγματοληψίας εξόδου:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "ΔιατήÏηση μοÏφής εισόδου"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "Î ÏοσημασμÎνος ακÎÏαιος 8 bit"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "Î ÏοσημασμÎνος ακÎÏαιος 16 bit"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "Î ÏοσημασμÎνος ακÎÏαιος 24 bit"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "Î ÏοσημασμÎνος ακÎÏαιος 32 bit"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "Δεκαδικός 32 bit"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Όταν το αÏχείο υπάÏχει ήδη:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "ΕÏώτηση"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Αντικατάσταση"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "ΕπεξεÏγασία ΡÏθμισης Κωδικοποιητή"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Ανώνυμος Κωδικοποιητής"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "ΕπÎκταση αÏχείου εξόδου:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Π.χ. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "ΓÏαμμή εντολών:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1913,7 -1946,7 +1990,7 @@@ msgstr "
"ΠαÏάδειγμα: lame - %o\n"
"%i για το αÏχείο εισόδου, %o για το αÏχείο εξόδου, - για το stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1923,66 -1956,72 +2000,72 @@@ msgstr "
"<small>%o - όνομα αÏχείου εξόδου\n"
"%i - όνομα Ï€ÏοσωÏÎ¹Î½Î¿Ï Î±Ïχείου εισόδου</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "ÎœÎθοδος"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Σωλήνωση"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Î ÏοσωÏινό αÏχείο"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>ΣυγγÏαφÎας ετικετών</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "ΕπεξεÏγαστής Ρυθμίσεων DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Ανώνυμη ΡÏθμιση DSP"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Î Ïοσθήκη"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Δε βÏÎθηκε το αÏχείο pixmap: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2010,27 -2049,27 +2093,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "Î ÏοσαÏμοσμÎνες ΕντολÎÏ‚ ΚελÏφους"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "ΕπεξεÏγασία"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "Κλείσιμο"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "ΕπεξεÏγασία Εντολής"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "Εντολή:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2039,74 -2078,74 +2122,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "ΑναγνωÏιστικό:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "Όνομα σε ελεÏθεÏη μοÏφή, για παÏάδειγμα \"Η εντολή μου\""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "Μονά Κομμάτια"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "ΔουλεÏει σε Îνα κομμάτι."
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "Πολλαπλά Κομμάτια"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "ΔουλεÏει σε πολλαπλά κομμάτια"
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "Τοπική"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "ΔουλεÏει σε τοπικά αÏχεία."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "ΑπομακÏυσμÎνη"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "ΔουλεÏει σε απομακÏυσμÎνα αÏχεία (Ï€.χ. ÏοÎÏ‚ http://)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2114,91 -2153,91 +2197,95 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "Î Ïοσθήκη Εντολής"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "ΔιαγÏαφή"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
"Αυτή η ενÎÏγεια θα διαγÏάψει την επιλεγμÎνη εντολή κελÏφους. Είστε σίγουÏοι;"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "Επιβεβαίωση ΑφαίÏεσης"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "Το αναγνωÏιστικό Ï€ÏÎπει να μην είναι κενό και να είναι μοναδικό.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "Ο τίτλος Ï€ÏÎπει να μην είναι κενός.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "Η Εντολή ΚελÏφους Ï€ÏÎπει να μην είναι κενή.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "Μη ΈγκυÏες ΤιμÎÏ‚."
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "Όλα τα αÏχεία (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "Άνοιγμα αÏχείου(-ων)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "Î Ïοσθήκη αÏχείου(-ων) στη λίστα αναπαÏαγωγής..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "Î Ïοσθήκη φακÎλου(-ων) στη λίστα αναπαÏαγωγής..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "ΑκολοÏθηση συμβολικών συνδÎσμων"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr "help.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "ΔιαγÏαφή αÏχείων από τον δίσκο"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "ΦόÏτωση Λίστας ΑναπαÏαγωγής"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "Άλλα αÏχεία (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "Αποθήκευση Λίστας ΑναπαÏαγωγής Ως"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "ΑÏχεία λιστών αναπαÏαγωγής DeaDBeeF EQ (*.dbpl)"
@@@ -2225,102 -2264,111 +2312,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr "Δεν Îχει επιλεχτεί τίποτα."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr "Αντικατάσταση με..."
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr "Εισαγωγή..."
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr "Αποκοπή"
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr "ΑντιγÏαφή"
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr "Επικόλληση"
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr "Κλείδωμα κίνησης"
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr "Μετακίνηση καÏÏ„Îλας αÏιστεÏά"
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr "Μετακίνηση καÏÏ„Îλας δεξιά"
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr "ΑφαίÏεση καÏÏ„Îλας"
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr "Μετονομασία καÏÏ„Îλας"
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr "Î Ïοσθήκη νÎας καÏÏ„Îλας"
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr "Εμφάνιση Κεφαλίδων Στηλών"
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr "Ανάπτυξη ÎºÎ¿Ï…Ï„Î¹Î¿Ï ÎºÎ±Ï„Î¬ 1 αντικείμενο"
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr "Ομογενής"
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr "Ανάπτυξη"
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr "ΓÎμιση"
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr "Αντικατάσταση με..."
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr "Εισαγωγή..."
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr "Αποκοπή"
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr "ΑντιγÏαφή"
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr "Επικόλληση"
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr "Κλείδωμα κίνησης"
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr "Μετακίνηση καÏÏ„Îλας αÏιστεÏά"
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr "Μετακίνηση καÏÏ„Îλας δεξιά"
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr "ΑφαίÏεση καÏÏ„Îλας"
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr "Μετονομασία καÏÏ„Îλας"
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr "Î Ïοσθήκη νÎας καÏÏ„Îλας"
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr "Εμφάνιση Κεφαλίδων Στηλών"
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr "Ανάπτυξη ÎºÎ¿Ï…Ï„Î¹Î¿Ï ÎºÎ±Ï„Î¬ 1 αντικείμενο"
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr "Ομογενής"
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr "Ανάπτυξη"
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr "ΓÎμιση"
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr "ΡÏθμιση κουμπιοÏ"
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr "ΕπεξεÏγασία λίστας αναπαÏαγωγής"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr "Μετονομασία Λίστας ΑναπαÏαγωγής"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr "ΑφαίÏεση Λίστας ΑναπαÏαγωγής"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr "Î Ïοσθήκη ÎÎας Λίστας ΑναπαÏαγωγής"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr "Όνομα"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/en_GB.po
index eee415d,3a1b605..7fd11ae
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@@ -7,9 -7,9 +7,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:49+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
"deadbeef-player/language/en_GB/)\n"
"Language: en_GB\n"
@@@ -18,17 -18,17 +24,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "About DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s ChangeLog"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF Translators"
@@@ -85,789 -85,816 +91,828 @@@ msgstr "Zero Preamp
msgid "Zero Bands"
msgstr "Zero Bands"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Presets"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 day %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d days %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Stopped | %d tracks | %s total playtime"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Paused | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "New Playlist"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "New Playlist (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Failed while reading help file"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Failed to load help file"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Warning"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_File"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Open file(s)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Add file(s)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Add folder(s)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Add location"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "New playlist"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Load playlist"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Save playlist"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Quit"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Edit"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Clear"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Select all"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Deselect all"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Invert selection"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Selection"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Remove"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Crop"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Find"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Title"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Track number"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artist"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Date"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Random"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Custom"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Preferences"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_View"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Status bar"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Equaliser"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Playback"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Order"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Linear"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Shuffle tracks"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Shuffle albums"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Looping"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Scroll follows playback"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Cursor follows playback"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Stop after current"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Jump to current track"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Help"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_ChangeLog"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_About"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Translators"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Search"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Stop"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Play"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pause"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Previous"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Next"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Play Random"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "About"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Quit"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Help"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Track Properties"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Settings"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Apply"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Close"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadata"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Properties"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Title:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Enter new column title here"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Type:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Item Index"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Playing"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Album Art"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Artist - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Duration"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Track Number"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Band / Album Artist"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Format:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Alignment:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Left"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Right"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Cancel"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Output plugin:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Output device:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Always convert 8 bit audio to 16 bit"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Sound"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Replay-gain mode:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Disable"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Track"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Replay-gain peak scale"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Replay-gain preamp:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Global preamp:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr "Add files from command line (or file manager) to this playlist:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Resume previous session on startup"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Don't add from archives when adding folders"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "_Playback"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Configure"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP Chain Preset"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Load"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Close minimises to tray"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Hide system tray icon"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Interface refresh rate (times per second):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Titlebar text while playing:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Titlebar text while stopped:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "GUI Plugin (changing requires restart):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Hide \"Delete from disk\" in context menu"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Auto-name playlists when adding a single folder"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Override"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Foreground"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Background"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Seek-bar/Volume-bar colours"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Middle"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Light"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Dark"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Base"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Text"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Tab strip colours"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "Override (loses GTK tree-view theming, but speeds up rendering)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Even row"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Odd row"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Selected row"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Selected text"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Cursor"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Playlist colours"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Colours"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Enable Proxy Server"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Proxy Server Address:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Proxy Server Port:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Proxy Type:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Proxy User-name:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Proxy Password:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Network"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -875,122 -902,128 +920,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Version: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Copyright"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Plugins"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Format"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Ascending"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Descending"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Select DSP Plugin"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Plugin"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Tag Writer Settings"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Write ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Write ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Write APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Strip ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Strip ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Strip APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 version"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Recommended)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 character encoding (default is iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Write ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -998,91 -1031,100 +1049,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Artist / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Track No."
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Add to playback queue"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Remove from playback queue"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Reload metadata"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Remove from disk"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Add column"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Edit column"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Remove column"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Group by"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "None"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Artist/Date/Album"
@@@ -1099,11 -1141,11 +1163,11 @@@ msgstr "Configure %s
msgid "Default Audio Device"
msgstr "Default Audio Device"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1111,7 -1153,7 +1175,7 @@@
msgid "Adding files..."
msgstr "Adding files..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Initialising..."
@@@ -1124,140 -1166,140 +1188,150 @@@ msgid "Really close the window?
msgstr "Really close the window?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Multiple values] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Key short-cuts"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Key short-cuts"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Value"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Writing tags..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Name:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Field names must not start with : or _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Cannot add field"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Field with such name already exists, please try different name."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Add field"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Remove field"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Options:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help or -h Print help (this message) and exit\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Quit player\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Print version info and exit\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Start playback\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Stop playback\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pause playback\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Toggle pause\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Next song in playlist\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Previous song in playlist\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Random song in playlist\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Append file(s) to existing playlist\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Print formatted track name to stdout\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1268,7 -1310,7 +1342,7 @@@ msgstr "
" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
" copy[r]ight, [e]lapsed\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1277,28 -1319,24 +1351,36 @@@ msgstr "
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
"- title\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Default"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Yes"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Default"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Yes"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "No"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1316,7 -1354,7 +1398,7 @@@ msgstr "
"PlayingAlbum ArtArtist - AlbumArtistAlbumTitleDurationTrack NumberBand / "
"Album ArtistCustom"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1324,7 -1362,7 +1406,7 @@@ msgstr "
"Left\n"
"Right"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1334,7 -1372,7 +1416,7 @@@ msgstr "
"Track\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1342,7 -1380,7 +1424,7 @@@ msgstr "
"Ascending\n"
"Descending"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1350,14 -1388,7 +1432,7 @@@ msgstr "
"2.3 (Recommended)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Couldn’t find pixmap file: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1369,7 -1400,7 +1444,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1662,7 -1693,7 +1737,7 @@@ msgstr "Automatic sample rate (override
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1679,35 -1710,40 +1754,40 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "The file already exists. Overwrite?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Converter warning"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Please select encoder"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Converter error"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Converting..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Select folder..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Failed to save encoder preset"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1715,77 -1751,77 +1795,77 @@@ msgstr "
"Check preset folder permissions, try to pick a different title, or free up "
"some disk space"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "Preset with the same name already exists. Pick another title."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Error"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Add new encoder"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Edit encoder"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Remove preset"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "This action will delete the selected preset. Are you sure?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Encoders"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Add plugin to DSP chain"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Failed to save DSP preset"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "New DSP Preset"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Edit DSP Preset"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP Presets"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Output folder:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Output file name:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1795,89 -1831,89 +1875,89 @@@ msgstr "
"File extension (e.g. .mp3) will be appended automatically.\n"
"Leave the field empty for the default (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Encoder:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP preset:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Number of threads:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Output sample format:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Keep source format"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 bit signed integer"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 bit signed integer"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 bit signed integer"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 bit signed integer"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 bit float"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "When file exists:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Prompt"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Overwrite"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Edit Encoder Preset"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Untitled Encoder"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Output file extension:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "E.g. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Command line:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1887,7 -1923,7 +1967,7 @@@ msgstr "
"Example: lame - %o\n"
"%i for input file, %o for output file, - for stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1897,66 -1933,72 +1977,72 @@@ msgstr "
"<small>%o - output file name\n"
"%i - temporary input file name</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Method:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Pipe"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Temporary file"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Tag writer</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "DSP Preset Editor"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Untitled DSP Preset"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Add"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Couldn’t find pixmap file: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1984,27 -2026,27 +2070,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2013,74 -2055,74 +2099,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2088,90 -2130,90 +2174,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2198,102 -2240,111 +2288,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/es.po
index 55668bb,2463327..d5c6727
--- a/po/es.po
+++ b/po/es.po
@@@ -3,18 -3,21 +3,27 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
- # Adolfo Jayme Barrientos <fitoschido at ubuntu.com>, 2013
+ # Adolfo Jayme Barrientos <fitoschido at ubuntu.com>, 2013
+ # Adolfo Jayme Barrientos <fitoschido at ubuntu.com>, 2013
+ # Carlos, 2013-2014
+ # Charlesles, 2013
# depaz <depazzz at gmail.com>, 2010
# Hugo Florentino <sysadmin at cips.cu>, 2010
- # legion1978 <legion1978 at gmail.com>, 2013
- # legion1978 <legion1978 at gmail.com>, 2013
+ # Roony Alvarez <legion1978 at gmail.com>, 2013
+ # Roony Alvarez <legion1978 at gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Spanish (http://www.transifex.com/projects/p/deadbeef-player/"
"language/es/)\n"
"Language: es\n"
@@@ -23,17 -26,17 +32,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Acerca de DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "Cambios en DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Traductores de DeaDBeeF"
@@@ -48,7 -51,7 +57,7 @@@ msgstr "Ajustes del EQ de DeaDBeeF (*.d
#: ../plugins/gtkui/eq.c:187
msgid "Load DeaDBeeF EQ Preset..."
- msgstr "Cargar Ajustes del EQ de DeaDBeef..."
+ msgstr "Cargar ajustes del EQ de DeaDBeeF…"
#: ../plugins/gtkui/eq.c:191
msgid "DeaDBeeF EQ presets (*.ddbeq)"
@@@ -56,7 -59,7 +65,7 @@@ msgstr "Ajustes del EQ de DeaDBeeF (*.d
#: ../plugins/gtkui/eq.c:252
msgid "Import Foobar2000 EQ Preset..."
- msgstr "Importar Ajustes del EQ de Foobar2000..."
+ msgstr "Importar ajustes del EQ de Foobar2000…"
#: ../plugins/gtkui/eq.c:256
msgid "Foobar2000 EQ presets (*.feq)"
@@@ -90,917 -93,951 +99,963 @@@ msgstr "Restablecer preamp
msgid "Zero Bands"
msgstr "Restablecer bandas"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Preajustes"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 dÃa y %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dÃas y %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Detenido | %d pistas | Tiempo total: %s"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Mono"
- msgstr "Mono"
+ msgstr "Monoaural"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Estéreo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
- msgstr "| %4d kbps "
+ msgstr "| %4d kb/s "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Pausado | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pistas | Tiempo total: %s"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
- msgstr "Nueva lista de reproducción"
+ msgstr "Lista de reproducción nueva"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
- msgstr "Nueva lista de reproducción (%d)"
+ msgstr "Lista de reproducción nueva (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Lista de reproducción con pestañas"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Lista de reproducción"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
- msgstr "Divisor (Superior e inferior)"
+ msgstr "Divisor (superior e inferior)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
- msgstr "Divisor (Izquierdo y derecho)"
+ msgstr "Divisor (izquierdo y derecho)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Pestañas de lista de reproducción"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Propiedades de selección"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Mostrar portada"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "Alcance"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "Espectro"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "Hbox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "Vbox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Botón"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Error al leer el archivo de ayuda"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Error al cargar el archivo de ayuda"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- "El reproductor está actualmente ejecutando tareas en trasfondo. Si sale "
- "ahora, las tareas serán canceladas o interrumpidas. Esto puede ocasionar "
- "pérdida de datos."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "¿Está seguro de que quiere salir?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Aviso"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Archivo"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Abrir archivo(s)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Añadir archivo(s)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Añadir carpeta(s)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Añadir dirección"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nueva lista de reproducción"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Cargar lista de reproducción"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Guardar lista de reproducción"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Salir"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Editar"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Limpiar"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Seleccionar todo"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Deseleccionar todo"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Invertir selección"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Selección"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Quitar"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Recortar"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Buscar"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Ordenar por"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "TÃtulo"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "N.º de la pista"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Ãlbum"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artista"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Fecha"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Aleatorio"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Personalizado"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Preferencias"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Ver"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Barra de estado"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ecualizador"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "Modo de diseño"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Reproducción"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Orden"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Lineal"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Barajar pistas"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Barajar álbumes"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Repetir"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Repetir todo"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Repetir una sola canción"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "No repetir"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Desplazar al cambiar de pista"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Seleccionar al cambiar de pista"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Detener al terminar la pista actual"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Saltar a la pista actual"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
- msgstr "_Ayuda"
+ msgstr "Ay_uda"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Cambios"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Acerca de"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Traductores"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Buscar"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Detener"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Reproducir"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pausar"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Anterior"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Siguiente"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Aleatorio"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Acerca de"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Salir"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Ayuda"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Propiedades de la pista"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "Ubicación:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Configuración"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Aplicar"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Cerrar"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadatos"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Propiedades"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "TÃtulo:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Escriba el tÃtulo de la columna"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Tipo:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Ãndice del elemento"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Reproduciendo"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Carátula"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Artista - Ãlbum"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Duración"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "N.º de la pista"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Banda / Artista"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Formato:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Alineación:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Izquierda"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Derecha"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Cancelar"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_Aceptar"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Complemento de salida:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Dispositivo de salida:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Siempre convertir audio de 8 bits a 16 bits"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr "Siempre convertir el sonido de 16 bits a 24 bits"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Sonido"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Modo replaygain:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Desactivar"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Pista"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Normalizar con replaygain"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Preamplificación replaygain:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Preamplificación global:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Agregar archivos desde la lÃnea de comandos (o gestor de archivos) a la "
"lista de reproducción:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Reanudar la sesión anterior al inicio"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Al añadir carpetas, no añadir de archivos comprimidos"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "Auto-resetear \"Detener al terminar la pista actual\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Reproducción"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Configurar"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Preajuste de la cadena DSP"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Cargar"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Cerrar minimiza a la bandeja"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Esconder icono de la bandeja del sistema"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "Activar la detección y grabación de Ruso CP1251"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Activar la detección y grabación de Chino CP936"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Tasa de refresco de la interfaz (veces por segundo):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Texto a mostrar en la barra de tÃtulo mientras se reproduce:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Texto a mostrar en la barra de tÃtulo mientras no se reproduce:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "Complemento de interfaz gráfica (cambiarlo requiere reiniciar):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
- msgstr ""
+ msgstr "Reproductor"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
- msgstr ""
+ msgstr "Cerrar listas de reproducción con botón central del ratón"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
- msgstr ""
+ msgstr "Resaltar en negritas la pista en reproducción"
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Esconder \"Borrar del disco\" del menú contextual"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Autonombrar listas de reproducción al añadir una carpeta"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
- msgstr ""
+ msgstr "Ajustar automáticamente las columnas a la ventana"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "Interfaz y más"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Anular"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Frente"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Fondo"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Colores de barras de tiempo/volumen"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Medio"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Claro"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Oscuro"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Base"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Texto"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Colores de pestañas"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "Cambiar (ignora el tema GTK, pero acelera el renderizado)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Fila par"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Fila impar"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Fila seleccionada"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Texto seleccionado"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Cursor"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Colores de lista de reproducción"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Colores"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Activar el servidor proxy"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Dirección:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Puerto:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Tipo:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Usuario:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Contraseña:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
- msgstr "HTTP User Agent (identificarse como):"
+ msgstr "Agente de usuario HTTP:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
- msgstr "Editar mapeo de Content-type"
+ msgstr "Editar asignación de tipo de contenido"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Red"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr "Teclas asignadas:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr "Acción:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<Sin asignar>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr "Combinación de teclas:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Tecla global"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
"The changes will NOT be saved\n"
"if you don't press Apply."
msgstr ""
+ "Para guardar los cambios pulse en Aplicar,\n"
+ "o para deshacerlos pulse en Revertir.\n"
+ "NO se guardarán los cambios\n"
+ "si no pulsa en Aplicar."
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
- msgstr ""
+ msgstr "_Predeterminados"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "Atajos de teclado"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Versión:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Copyright"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Complementos"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "Agrupar por…"
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "Ordenar por…"
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Formato"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Ascendente"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Descendente"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Seleccione el complemento DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Complemento"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Preferencias del editor de etiquetas"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Escribir ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Escribir ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Escribir APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Recortar ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Recortar ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Recortar APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "Versión de ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (recomendada)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "Codificación de ID3v1 (la predet. es iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Escribir ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "Mapeo de tipo de contenido"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1012,91 -1049,100 +1067,104 @@@ msgstr "
"del tipo \"audio/x-mpeg\", y necesitar ser decodificados por el propio "
"plugin \"stdmpg\" de DeaDBeeF o por el plugin \"ffmpeg\"."
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "Restablecer los valores predeterminados"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "Tipo de contenido:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "Complementos:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr "Propiedades del botón:"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr "Color:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr "Color del texto:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr "Icono:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr "Etiqueta:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr "Seleccione una acción"
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Artista / Ãlbum"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Pista n.º"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Añadir a cola de reproducción"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Quitar de cola de reproducción"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Recargar los metadatos"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Eliminar del disco"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Añadir una columna"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Editar la columna"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Quitar la columna"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
- msgstr ""
+ msgstr "Mantener grupos al desplazarse"
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Agrupar por"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Nada"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Artista/Fecha/Ãlbum"
@@@ -1113,19 -1159,20 +1181,20 @@@ msgstr "Configurar %s
msgid "Default Audio Device"
msgstr "Dispositivo de sonido predeterminado"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
+ "Modificó la configuración de atajos de teclado, pero no guardó los cambios."
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
- msgstr ""
+ msgstr "¿Quiere continuar sin guardar?"
#: ../plugins/gtkui/progress.c:56
msgid "Adding files..."
msgstr "Añadiendo archivos…"
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Inicializando…"
@@@ -1138,102 -1185,102 +1207,112 @@@ msgid "Really close the window?
msgstr "¿Realmente quiere cerrar la ventana?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Valores múltiples]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Clave"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Clave"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Valor"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[Valores múltiples]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Escribiendo las etiquetas…"
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Nombre del campo"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Nombre:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Los nombres de campos no deben comenzar con : o _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "No se puede añadir el campo"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Ya existe un campo con ese nombre, por favor utilice otro diferente."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Añadir campo"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Quitar campo"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "Uso: deadbeef [opciones] [--] [archivo(s)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Opciones:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help o -h Mostrar la ayuda (este mensaje) y salir\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Salir del reproductor\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Mostar la versión y salir\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Iniciar reproducción\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Parar reproducción\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pausar reproducción\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Alternar pausa\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1241,40 -1288,40 +1320,40 @@@ msgstr "
" --play-pause Iniciar la reproducción si está detenida, pausar en "
"caso contrario\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Siguiente pista de la lista de reproducción\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Pista anterior de la lista de reproducción \n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Canción aleatoria de la lista de reproducción\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Añadir archivo(s) a la lista de reproducción\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr "--gui PLUGIN Dice cual plugin de IGU usar, \"GTK2\" por defecto\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
" --nowplaying FMT Mostrar nombre de la pista formateado a través de "
"stdout\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1285,7 -1332,7 +1364,7 @@@ msgstr "
" l: Duración, n: Pista, y: Año, c: Comentario,\n"
" r: Copyright, e: Tiempo restante\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1294,28 -1341,24 +1373,36 @@@ msgstr "
" ej.: --nowplaying \"%%a - %%t\" mostrarÃa \"artista - "
"tÃtulo\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " para más información, vea http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Predeterminado"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "SÃ"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Predeterminado"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "SÃ"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "No"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1341,7 -1384,7 +1428,7 @@@ msgstr "
"Banda / Artista del álbum\n"
"Personalizado"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1349,7 -1392,7 +1436,7 @@@ msgstr "
"Izquierda\n"
"Derecha"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1359,7 -1402,7 +1446,7 @@@ msgstr "
"\\Pista\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1367,7 -1410,7 +1454,7 @@@ msgstr "
"Ascendente\n"
"Descendente"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1375,14 -1418,7 +1462,7 @@@ msgstr "
"2.3 (recomendada)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Imposible encontrar el archivo pixmap: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1395,8 -1431,8 +1475,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "Añadir un CD de sonido"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1442,7 -1478,7 +1522,7 @@@ msgstr "URL de Scrobble
#: ../translation/extra.c:16
msgid "Prefer Album Artist over Artist field"
- msgstr "Preferir Artista del Ãlbum sobre campo de Artista"
+ msgstr "Preferir campo «Artista del álbum» sobre «Artista»"
#. OSS output plugin
#: ../translation/extra.c:18
@@@ -1514,7 -1550,7 +1594,7 @@@ msgstr "calidad de remuestreo (0..2, su
#: ../translation/extra.c:37
msgid "8-bit output (default is 16)"
- msgstr "Salida de 8-bits (Por defecto es 16)"
+ msgstr "Salida de 8 bits (predeterminada: 16)"
#. Game_Music_Emu decoder plugin
#: ../translation/extra.c:39
@@@ -1690,8 -1726,8 +1770,8 @@@ msgstr "Muestreo automático (anula la
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "Configurar órdenes del usuario"
+ msgid "Configure Custom Shell Commands"
+ msgstr ""
#. mpgmad
#: ../translation/extra.c:99
@@@ -1701,41 -1737,46 +1781,46 @@@ msgstr "Desactivar la reproducción si
#. adplug
#: ../translation/extra.c:101
msgid "Prefer Ken emu over Satoh (surround won't work)"
- msgstr "Preferir emulador Ken sobre Satoh (El surround no funcionará)"
+ msgstr "Preferir emulador Ken sobre Satoh (el sonido envolvente no funcionará)"
#: ../translation/extra.c:102
msgid "Enable surround"
msgstr "Activar el sonido envolvente"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "El archivo ya existe. ¿Sobreescribir?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Alerta del convertidor"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Por favor, seleccione el codificador"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Error del convertidor"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Convirtiendo…"
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Seleccionar carpeta..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Fallo al guardar preajuste del codificador"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1743,78 -1784,78 +1828,78 @@@ msgstr "
"Verifique los permisos de la carpeta de preajustes, intente escoger otro "
"tÃtulo, o libere algo de espacio en disco"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
"Ya existe un preajuste con el mismo nombre. Intente escoger otro tÃtulo."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Error"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Añadir nuevo codificador"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Modificar codificador"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Quitar preajuste"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Esta acción eliminará el preajuste seleccionado. ¿Está seguro?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Codificadores"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Añadir complemento a la cadena DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Fallo al guardar preajuste DSP"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Nuevo preajuste DSP"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Modificar preajuste DSP"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "Preajustes DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Carpeta de salida:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "Escribir a la carpeta fuente de la pista"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
- msgstr "Preservar la estructura de carpetas"
+ msgstr "Conservar estructura de las carpetas"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Nombre del archivo de salida:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1824,89 -1865,89 +1909,89 @@@ msgstr "
"La extensión (p.ej. .mp3) se agregará automáticamente.\n"
"Deje el campo vacÃo para el valor predeterminado (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Codificador:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "Preajuste DSP:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Número de hilos:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Formato de muestra de salida:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Mantener el formato de origen"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "entero 8 bit con signo"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "entero 16 bit con signo"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "entero 24 bit con signo"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "entero 32 bit con signo"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "flotante 32 bit"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Cuando el archivo exista:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Preguntar"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Sobreescribir"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Modificar preajuste del codificador"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Codificador sin nombre"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Extensión del archivo de salida:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "P. ej. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "LÃnea de órdenes:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1916,7 -1957,7 +2001,7 @@@ msgstr "
"Ejemplo: lame - %o\n"
"%i para el archivo de entrada, %o para el archivo de salida, - para stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1926,66 -1967,72 +2011,72 @@@ msgstr "
"<small>%o - nombre del archivo de salida\n"
"%i - nombre del archivo de entrada temporal</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Método:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "TuberÃa"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Archivo temporal"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Editor de etiquetas</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "Editor de preajustes DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Preajuste DSP sin nombre"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Añadir"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Imposible encontrar el archivo pixmap: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1995,12 -2042,12 +2086,12 @@@
"32 bit signed int\n"
"32 bit float"
msgstr ""
- "Mantener el formato fuente\n"
- "8 bit signed int\n"
- "16 bit signed int\n"
- "24 bit signed int\n"
- "32 bit signed int\n"
- "32 bit float"
+ "Mantener el formato original\n"
+ "Entero firmado de 8 bits\n"
+ "Entero firmado de 16 bits\n"
+ "Entero firmado de 24 bits\n"
+ "Entero firmado de 32 bits\n"
+ "Flotante de 32 bits"
#: ../plugins/converter/converter.glade.h:19
msgid ""
@@@ -2008,7 -2055,7 +2099,7 @@@
"Overwrite"
msgstr ""
"Preguntar\n"
- "Sobre escribir"
+ "Sobreescribir"
#: ../plugins/converter/converter.glade.h:34
msgid ""
@@@ -2023,27 -2070,27 +2114,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "Órdenes personalizadas"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "Editar"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "Cerrar"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "Editar la orden"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "Orden:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2051,153 -2098,154 +2142,158 @@@
"main application was started from. Title formatting can be used. Example: "
"xdg-open %D"
msgstr ""
- "Cualquier comando shell. Será ejecutado en el contexto en el cual la "
- "aplicación principal fue iniciada. El formato de tÃtulo puede usarse. "
- "Ejemplo: xdg-open %D"
+ "Cualquier orden de consola. Se ejecutará en el contexto que inició la "
+ "aplicación. Puede usarse formato de tÃtulo. Ejemplo: xdg-open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
- msgstr "ID:"
+ msgstr "Id.:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
- msgstr "Nombre libre, por ejemplo \"Mi comando shell\""
+ msgstr "Nombre libre, por ejemplo «Mi orden de consola»"
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- "La ID de comando, normalmente debe ser corta, por ejemplo \"youtube_open\". "
- "Debe ser única."
+ "El identificador de la orden: debe ser corto y único, p.ej., «youtube_abrir»."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
- msgstr "Pistas Sencillas"
+ msgstr "Pistas individuales"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "Funciona en pista individual"
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "Múltiples pistas"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "Funciona en múltiples pistas"
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "Locales"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "Funciona en archivos locales"
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
- msgstr "Remoto"
+ msgstr "Remotos"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
- msgstr "Funciona en archivos remotos (p.e. http:// streams)"
+ msgstr "Funciona en archivos remotos (p.ej., transmisiones http://)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
- msgstr ""
+ msgstr "Genérico (menú principal)"
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "El elemento debe aparecer en el menú principal"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
"contains the menu path like this: \"File/My Command\", where File is the "
"menu name in the English version.</small>"
msgstr ""
+ "<small>Si desea añadir la orden al menú principal, asegúrese que el tÃtulo "
+ "incluya la ruta al menú de la siguiente forma: \"File/Mi orden\", donde File "
+ "es el nombre del menú en la versión inglesa.</small>"
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "Añadir orden"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "Eliminar"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
- msgstr "Esta acción eliminará el comando seleccionado. ¿Está seguro?"
+ msgstr "Esta acción eliminará la orden de consola seleccionada. ¿Está seguro?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
- msgstr "Confirmar borrado"
+ msgstr "Confirmar eliminación"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "El id. es obligatorio y debe ser único.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "El tÃtulo es obligatorio.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "Debe proporcionar la orden del intérprete.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "Valores no válidos"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "Formatos de sonido admitidos"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "Todos los archivos (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
- msgstr "Abrir archivos (*)"
+ msgstr "Abrir archivo(s)…"
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
- msgstr "Agregar archivo(s) a la lista de reproducción..."
+ msgstr "Añadir archivo(s) a la lista…"
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
- msgstr "Agregar carpeta(s) a la lista de reproducción..."
+ msgstr "Añadir carpeta(s) a la lista…"
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "Seguir enlaces simbólicos"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr "help.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "Eliminar los archivos del disco"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2205,19 -2253,19 +2301,19 @@@ msgstr "
"Los archivos se perderán. ¿Continuar?\n"
"(Este diálogo puede desactivarse en las preferencias del plugin GTKUI)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "Cargar lista de reproducción"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "Otros archivos (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "Guardar lista de reproducción como"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "Archivos de DeaDBeeF (*.dbpl)"
@@@ -2251,102 -2299,111 +2347,191 @@@ msgstr "
msgid "Nothing is selected."
msgstr "No se ha seleccionado nada."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr "Reemplazar con…"
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr "Insertar…"
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr "Cortar"
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr "Copiar"
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr "Pegar"
+
+#: ../plugins/gtkui/widgets.c:764
- msgid "Multiple widgets of this type are not supported"
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr "Reemplazar con…"
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr "Insertar…"
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr "Cortar"
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr "Copiar"
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr "Pegar"
+
+ #: ../plugins/gtkui/widgets.c:942
++>>>>>>> upstream/0.6.2
+ msgid "Multiple widgets of this type are not supported"
+ msgstr "No se admiten múltiples widgets de este tipo"
+
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr "Bloquear el movimiento"
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr "Mover la pestaña a la izquierda"
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr "Mover la pestaña a la derecha"
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr "Eliminar la pestaña"
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr "Renombrar la pestaña"
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr "Añadir una pestaña nueva"
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr "Mostrar los tÃtulos de las columnas"
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr "Expandir el cuadro un elemento"
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr "Reducir el cuadro un elemento"
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr "Homogéneo"
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr "Expandir"
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr "Rellenar"
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr "Bloquear el movimiento"
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr "Mover la pestaña a la izquierda"
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr "Mover la pestaña a la derecha"
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr "Eliminar la pestaña"
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr "Renombrar la pestaña"
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr "Añadir una pestaña nueva"
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr "Mostrar los tÃtulos de las columnas"
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr "Expandir el cuadro un elemento"
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr "Reducir el cuadro un elemento"
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr "Homogéneo"
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr "Expandir"
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr "Rellenar"
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr "Configurar el botón"
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
- msgstr ""
+ msgstr "Editar lista de reproducción"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
- msgstr ""
+ msgstr "Renombrar lista de reproducción"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
- msgstr ""
+ msgstr "Eliminar lista de reproducción"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
- msgstr ""
+ msgstr "Añadir lista de reproducción nueva"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
- msgstr ""
+ msgstr "Nombre"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
++<<<<<<< HEAD
+msgstr ""
++=======
+ msgstr "Navegador de listas de reproducción"
++>>>>>>> upstream/0.6.2
diff --combined po/et.po
index bc2bdf6,57c8165..7f9c4c8
--- a/po/et.po
+++ b/po/et.po
@@@ -7,9 -7,9 +7,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Estonian (http://www.transifex.com/projects/p/deadbeef-player/"
"language/et/)\n"
"Language: et\n"
@@@ -18,17 -18,17 +24,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "DeaDBeeF %s teave"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s muudatuste logi"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF tõlkijad"
@@@ -85,789 -85,816 +91,828 @@@ msgstr "Nulli eelvõimendus
msgid "Zero Bands"
msgstr "Nulli ribad"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Eelhäälestused"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 päev %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d päeva %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Peatatud | %d lugu | %s kokku mängitud"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Paus | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d lugu | %s kokku mängitud"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Uus esitusloend"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Uus esitusloend (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Abifaili lugemine ebaõnnestus"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Abifaili laadimine ebaõnnestus"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Hoiatus"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Fail"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Ava fail(e)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Lisa fail(e)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Lisa kaust(ad)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Lisa asukoht"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Uus esitusloend"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Lae esitusloend"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Salvesta esitusloend"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Välju"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Redigeerimine"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Puhasta"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Vali kõik"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Tühista kõik"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Pööra valik"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Valik"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Eemalda"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Kärbi"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Otsi"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Tiitel"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Loo number"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artist"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Aeg"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Juhuslik"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Muu"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Eelistused"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Vaade"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Olekuriba"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ekvalaiser"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Taasesitus"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Järjestus"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Järjest"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Lugude juhuesitus"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Albumite juhuesitus"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Kordamine"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Kerimisriba järgib taasesitust"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Kursor järgib taasesitust"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Peata pärast praegust"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Hüppa praeguse loo juurde"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Abi"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Muudatuste logi"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Teave"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Tõlkijad"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Otsi"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Seiska"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Esita"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Peata"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Eelmine"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Järgmine"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Mängi juhuslikult"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Teave"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Välju"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Abi"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Loo omadused"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Seaded"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Rakenda"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Sulge"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metaandmed"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Omadused"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Tiitel:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Sisesta siia uue veeru pealkiri"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Tüüp:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Register"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Mängib"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Albumikujundus"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Esitaja - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Kestvus"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Loo number"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Bänd / Albumi esitaja"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Formaat:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Paigutus:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Vasakul"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Paremal"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Tühista"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Väljund plugin:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Väljund seade:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Alati teisendada 8 bitine heli 16 bitiseks"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Heli"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Helitugevuse parandus:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Keela"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Lugu"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Helitugevuse paranduse piigi väärtus"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Taasesituse eelvõimendus:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Globaalne eelvõimendus:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr "Lisa faile käsurealt (või failihaldurist) sellese esitusloendisse:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Jätka käivitamisel eelmist seanssi"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Ära lisa kaustade lisamisel arhiivide sisu"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Taasesitus"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Seadistamine"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP eelseadistus"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Lae"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Sulgemine minimeerib akna"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Süsteemisalve ikooni peitmine"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Kasutajaliidese värskendussagedus (korda sekundis):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Tiitelriba tekst esitamise ajal:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Tiitelriba tekst peatamise ajal:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "Graafiline plugin (muutus nõuab taaskäivitust):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Peida menüüst kirje \"Kustuta kettalt\""
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Esitusloendi automaatne nimetamine üksiku kausta lisamisel"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Eira parameetreid"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Esiplaan"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Taust"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Heli- ja esitlusliuguri värvid"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Keskel"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Hele"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Tume"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Alus"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Tekst"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Tabeli värv"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "Tühista (kaotab GTK puuvaate teema, kuid kiirendab renderdamist)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Paaris rida"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Paaritu rida"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Valitud rida"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Valitud tekst"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Kursor"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Esitusloendi värvid"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Värvid"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Puhverserveri lubamine"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Puhverserveri aadress:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Puhverserveri port:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Puhverserveri tüüp:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Puhverserveri kasutajanimi:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Puhverserveri parool:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Võrk"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -875,122 -902,128 +920,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Versioon: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Autoriõigused"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Pluginad"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Formaat"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Kasvav"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Kahanev"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Vali DSP plugin"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Plugin"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Sildikirjutaja seaded"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Kirjuta ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Kirjuta ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Kirjuta APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "ID3v2 eemaldamine"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "ID3v1 eemaldamine"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "APEv2 eemaldamine"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 versioon"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Soovitatav)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 märgikodeering (vaikimisi iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Kirjuta ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -998,91 -1031,100 +1049,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Esitaja / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Loo number"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Lisa esitusnimekirja"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Eemalda esitusnimekirjast"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Uuestilae metaandmed"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Eemalda kettalt"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Lisa veerg"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Muuda veergu"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Eemalda veerg"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Rühmitamise alus"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Mitte ükski"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Esitaja/Aeg/Album"
@@@ -1099,11 -1141,11 +1163,11 @@@ msgstr "Konfigureeri %s
msgid "Default Audio Device"
msgstr "Vaikimisi audioseade"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1111,7 -1153,7 +1175,7 @@@
msgid "Adding files..."
msgstr "Failide lisamine..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Algväärtustamine..."
@@@ -1124,102 -1166,102 +1188,112 @@@ msgid "Really close the window?
msgstr "Kas soovid akna sulgeda?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Mitu väärtust] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Võti"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Võti"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Väärtus"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Siltide kirjutamine..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Nimi:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Väljanimi ei tohi alata sümboliga : või _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Ei õnnestu välja lisada"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Sellise nimega väli on juba olemas, proovi teist ​​nime."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Lisa väli"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Eemalda väli"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Valikud:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help või -h Prindib abi (praeguse sõnumi) ja väljub\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Mängijast väljumine\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Väljastab versiooniteabe ja väljub\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Alustab taasesitlust\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Peatab taasesitluse\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Taasesituse paus\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Pausi lülitamine\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1227,38 -1269,38 +1301,38 @@@ msgstr "
" --play-pause Kui peatatud siis alustab taasesitlust, muidu lülitab "
"pausi ümber\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Järgmine lugu esitlusloendist\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Eelmine lugu esitlusloendist\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Juhuslik lugu esitlusloendist\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Lisab faili(e) esitlusloendisse\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Prindib loo andmed etteantud formaadis\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1269,7 -1311,7 +1343,7 @@@ msgstr "
" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
" copy[r]ight, [e]lapsed\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1278,28 -1320,24 +1352,36 @@@ msgstr "
" näide.: --nowplaying \"%%a - %%t\" peaks väljastama "
"\"artist - loo nimi\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " lisainfot leiab lehelt http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Vaikimisi"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Jah"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Vaikimisi"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Jah"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Ei"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1325,7 -1363,7 +1407,7 @@@ msgstr "
"Bänd / Albumi Artist\n"
"Muu"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1333,7 -1371,7 +1415,7 @@@ msgstr "
"Vasak\n"
"Parem"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1343,7 -1381,7 +1425,7 @@@ msgstr "
"Lugu\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1351,7 -1389,7 +1433,7 @@@ msgstr "
"Kasvav\n"
"Kahanev"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1359,14 -1397,7 +1441,7 @@@ msgstr "
"2.3 (Soovitatav)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Ei leitud pixmap faili: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1378,7 -1409,7 +1453,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1672,7 -1703,7 +1747,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1689,35 -1720,40 +1764,40 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Fail on juba olemas. Kas kirjutada see üle?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Konverteri hoiatus"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Palun vali kodeerija"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Konverteerimise viga"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Konvertimine..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Kausta valimine..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Kodeerija eelseadistuse salvestamine ebaõnnestus"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1725,78 -1761,78 +1805,78 @@@ msgstr "
"Kontrolli seadistuste kausta õiguseid, proovi valida teistsugune nimi või "
"vabasta kettapinda"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
"Sama nimega seadistus juba eksisteerib. Vali seadistusele teistsugune nimi."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Viga"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Lisa uus kodeerija"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Muuda kodeerijat"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Eemalda eelseadistus"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "See kustutab valitud seadistuse. Oled sa kindel?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Kodeerijad"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Lisa DSP plugin"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "DSP seadistuse salvestamine ebaõnnestus"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Uus DSP seadistus"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "DSP seadistuse muutmine"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP seadistused"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Väljundkaust:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Väljundfaili nimi:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1806,89 -1842,89 +1886,89 @@@ msgstr "
"Faililaiendused (näiteks .mp3) lisatakse automaatselt.\n"
"Vaikimisi väärtuse jaoks jäta väli tühjaks (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Enkooder:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP seadistus:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Lõimede arv:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Väljundsämpli formaat:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Säilita allika formaat"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 bit signed int"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 bit signed int"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 bit signed int"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 bit signed int"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 bit float"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Kui fail on olemas:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Küsi"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Kirjuta üle"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Kodeerija seadistuste muutmine"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Ilma nimeta kodeerija"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Väljundfaili laiend:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Näiteks mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Käsurida:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1898,7 -1934,7 +1978,7 @@@ msgstr "
"Näide: lame - %o\n"
"%i sisendfail, %o väljundfail, - stdin jaoks"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1908,66 -1944,72 +1988,72 @@@ msgstr "
"<small>%o - väljundfaili nimi\n"
"%i - ajutise sisendfaili nimi</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Meetod:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Toru"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Ajutine fail"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Sildi kirjutaja</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "DSP seadistuse redaktor"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Ilma nimeta DSP seadistus"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Lisa"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Ei leitud pixmap faili: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1995,27 -2037,27 +2081,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2024,74 -2066,74 +2110,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2099,90 -2141,90 +2185,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2209,102 -2251,111 +2299,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/eu.po
index c698303,e5c2456..49dbfff
--- a/po/eu.po
+++ b/po/eu.po
@@@ -3,15 -3,16 +3,27 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
++<<<<<<< HEAD
+# John Smith <aboutafteragain at gmail.com>, 2013
+# John Smith <aboutafteragain at gmail.com>, 2013
++=======
+ # aboutafteragain <aboutafteragain at gmail.com>, 2013
+ # aboutafteragain <aboutafteragain at gmail.com>, 2013-2014
+ # aboutafteragain <aboutafteragain at gmail.com>, 2013
++>>>>>>> upstream/0.6.2
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 21:13+0000\n"
+ "Last-Translator: aboutafteragain <aboutafteragain at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Basque (http://www.transifex.com/projects/p/deadbeef-player/"
"language/eu/)\n"
"Language: eu\n"
@@@ -20,17 -21,17 +32,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "DeadBeeF %s-(r)i buruz"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeadBeeF %s-(r)en aldaketa egunkaria"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeadBeeF itzultzaileak"
@@@ -87,44 -88,44 +99,52 @@@ msgstr "Zerotu aurreanplifikazioa
msgid "Zero Bands"
msgstr "Zerotu bandak"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Aurrezarpenak"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "Egun 1 %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d egun %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Geldituta | %d pista | guztizko erreprodukzio-denbora: %s"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Estereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kb/s "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Pausatuta | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -132,752 -133,779 +152,783 @@@ msgstr "
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pista | guztizko "
"erreprodukzio-denbora: %s"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Erreprodukzio-zerrenda berria"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Erreprodukzio-zerrenda berria (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Fitxadun erreprodukzio-zerrenda"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Erreprodukzio zerrenda"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "Zatitzailea (goi eta behe)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "Zatitzailea (ezker eta eskuin)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Erreprodukzio zerrendaren fitxak"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Aukeraketaren propietateak"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Albumaren azala erakutsi"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "Esparrua"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "Espektroa"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Botoia"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr "Bilaketa-barra"
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr "Erreprodukzio kontrolak"
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr "Ozentasun barra"
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr "Txiptune ahotsak"
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Hutsegitea laguntza fitxategia irakurtzean"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Hutsegitea laguntza fitxategia kargatzean"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
"Erreproduzitzailea atzeko planoan lan egiten ari da. Orain ateratzen bazara, "
"zeregin hauek bertan behera utziko ditu. Honek datuak galtzea eragin dezake."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "Ziur zaude atera nahi duzula?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Abisua"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Fitxategia"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Ireki fitxategia(k)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Gehitu fitxategia(k)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Gehitu karpeta(k)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Gehitu kokapena"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Erreprodukzio-zerrenda berria"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Kargatu erreprodukzio-zerrenda"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Gorde erreprodukzio-zerrenda"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Irten"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Editatu"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Garbitu"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Hautatu dena"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Desautatu dena"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Alderantzikatu hautapena"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Hautapena"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Kendu"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Moztu"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Aurkitu"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Ordenatu"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Izenburua"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Pista zenbakia"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Albuma"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artista"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Data"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Ausazkoa"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Pertsonalizatua"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Hobespenak"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Ikusi"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Egoera-barra"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ekualizadorea"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "Diseinu modua"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Erreproduzitu"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Ordena"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Lineala"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Nahastu pistak"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Nahastu albumak"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Errepikapenak"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Dena errepikatu"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Abesti bakarra errepikatu"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Ez errepikatu"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Korritzeak erreprodukzioa jarraitzen du"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Kurtsoreak erreprodukzioa jarraitzen du"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Gelditu unekoaren ondoren"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Jauzi uneko pistara"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Laguntza"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Aldaketa-egunkaria"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Honi buruz"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Itzultzaileak"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Bilatu"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Gelditu"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Erreproduzitu"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pausatu"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Aurrekoa"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Hurrengoa"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Erreproduzitu ausazkoa"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Honi buruz"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Irten"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Laguntza"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Pistaren propietateak"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "Kokapena:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Ezarpenak"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Aplikatu"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Itxi"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadatuak"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Propietateak"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Izenburua:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Sartu zutabe berriaren goiburua hemen"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Mota:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Elementuaren indizea"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Erreproduzitzen"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Albumaren azala"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Artista - Albuma"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Iraupena"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Pista zenbakia"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Taldea / Albuma Artista"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Formatua:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Lerrokatzea:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Ezkerrean"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Eskuinean"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Utzi"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_Ados"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Irteera plugina:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Irteera gailua:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Bihurtu beti 8 biteko audioa 16 bitera"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Soinua"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Replaygain modua:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Desgaitu"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Pista"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Replaygain gailurraren eskala"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Replaygain aurre-anplifikazioa:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Aurreanplifikazio orokorra:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Gehitu fitxategiak erreprodukzio-zerrenda honetara komando-lerrotik (edo "
"fitxategi-kudeatzailetik):"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Berrezarri aurreko saioa abiatzean"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Ez gehitu fitxategietatik karpetak gehitzean"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "\"Gelditu unekoaren ondoren\" Auto-berrezarri"
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Erreproduzitu"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Konfiguratu"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP katearen aurrezarpenak"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Kargatu"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Ixteak erretilura minimizatzen du"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Ezkutatu sistemaren erretiluko ikonoa"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "Errusiar CP1251 detekzioa eta birkodeaketa gaitu"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Txinatar CP936 detekzioa eta birkodeaketa gaitu"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Interfazearen freskatze-maiztasuna (zenbatetan segundoko)"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "TItulu-barraren testua erreproduzitzean:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Titulu-barraren testua gelditutakoan:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "GUI plugina (aldatzeak berrabiaraztea eskatzen du):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Ezkutatu \"Ezabatu diskotik\" laster-menuko elementua"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
"Izendatu erreprodukzio-zerrendak automatikoki karpeta bakar bat gehitzean"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "GUI/Misc"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Indargabetu"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Aurreko planoa"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Atzeko planoa"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Bilaketa-barra/Bolumen-barraren koloreak"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Ertaina"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Argia"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Iluna"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Oinarrizkoa"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Testua"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Fitxen koloreak"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"Indargabetu (GTK zuhaitz-ikuspegien gaiak galtzen dira, baina errendatzea "
"azkartzen da)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Errenkada bikoitia"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Errenkada bakoitia"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Hautatutako errenkada"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Hautatutako testua"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Kurtsorea"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Erreprodukzio-zerrenda koloreak"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Koloreak"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Gaitu proxy zerbitzaria"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Proxy zerbitzariaren helbidea:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Proxy zerbitzaria ataka:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Proxy mota:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Proxy erabiltzaile-izena:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Proxy pasahitza:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "HTTP User Agent-a:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "Content-Type mapeoa editatu"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Sarea"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<Ez ezarrita>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Abio-lasterreko tekla globala"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -885,122 -913,128 +936,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "Abio-lasterreko teklak"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Bertsioa: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Copyright-a"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Pluginak"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URLa:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "Taldekatzeko irizpidea ..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "Ordenatzeko irizpidea ..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Formatua"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Gorakorra"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Beherakorra"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Hautatu DSP plugina"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Plugina"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Etiketa-idazlearen ezarpenak"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Idatzi ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Idatzi ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Idatzi APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Soildu ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Soildu ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Soildu APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 bertsioa"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Gomendatua)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 karaktere-kodeketa (lehenetsia iso8859-1 da)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Idatzi ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "Content-Type Mapeoa"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1008,91 -1042,100 +1065,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Artista / Albuma"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Pista zbk"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Gehitu erreprodukzio-ilarara"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Kendu erreprodukzio-ilaratik"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Birkargatu metadatuak"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Kendu diskotik"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Gehitu zutabea"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Editatu zutabea"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Kendu zutabea"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Taldekatzeko irizpidea"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Bat ere ez"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Artista/Data/Albuma"
@@@ -1109,11 -1152,11 +1179,11 @@@ msgstr "Konfiguratu %s
msgid "Default Audio Device"
msgstr "Audio gailu lehenetsia"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1121,7 -1164,7 +1191,7 @@@
msgid "Adding files..."
msgstr "Fitxategiak gehitzen..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Hasieratzen..."
@@@ -1134,104 -1177,104 +1204,114 @@@ msgid "Really close the window?
msgstr "Ziur leihoa itxi nahi duzula?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Hainbat balio] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Gakoa"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Gakoa"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Balioa"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[Hainbat balio] "
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Etiketak idazten..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Eremu izena"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Izena:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Ezin dituzu : edo _ erabili eremu-izenen hasieran"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Ezin da eremua gehitu"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
"Izen hori duen eremua existitzen da dagoeneko, mesedez erabili izen "
"desberdin bat."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Gehitu eremua"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Kendu eremua"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "Erabilera: deadbeef [aukerak] [--] [fitxategia(k)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Aukerak:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help or -h Inprimatu laguntza (mezu hau) eta irten\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Irten erreproduzitzailetik\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Inprimatu bertsio-informazioa eta irten\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Hasi erreprodukzioa\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Gelditu erreprodukzioa\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pausatu erreprodukzioa\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Txandakatu pausatzea\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1239,42 -1282,42 +1319,42 @@@ msgstr "
" --play-pause Hasi erreproduzitzen geldituta badago, bestela "
"txandakatu pausa\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Erreprodukzio-zerrendako hurrengo kanta\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Erreprodukzio-zerrendako aurreko kanta\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Erreprodukzio-zerrendako ausazko kanta\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr ""
" --queue Gehitu fitxategia(k) existitzen den erreprodukzio-"
"zerrendara\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
"--gui PLUGIN-ek zein GUI plugin erabili esaten du, lehenetsia \"GTK2\" da\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
" --nowplaying FMT Inprimatu formatudun pista-izena irteera estandarrera\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1286,7 -1329,7 +1366,7 @@@ msgstr "
"iruzkina,\n"
" r: copyright-a, e: igarotakoa\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1295,28 -1338,24 +1375,36 @@@ msgstr "
" adibidez.: --nowplaying \"%%a - %%t\" erabiliz gero "
"\"artista - titulua\" inprimatuko du\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " Informazio gehiagorako, begiratu http://sourceforge."
- "net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Lehenetsia"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Bai"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Lehenetsia"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Bai"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Ez"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1342,7 -1381,7 +1430,7 @@@ msgstr "
"Taldea / Albuma Artista\n"
"Pertsonalizatua"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1350,7 -1389,7 +1438,7 @@@ msgstr "
"Ezkerra\n"
"Eskuina"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1360,7 -1399,7 +1448,7 @@@ msgstr "
"Pista\n"
"Albuma"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1368,7 -1407,7 +1456,7 @@@ msgstr "
"Gorakorra\n"
"Beherakorra"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1376,14 -1415,7 +1464,7 @@@ msgstr "
"2.3 (Gomendatua)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Ezin izan da pixmap fitxategia aurkitu: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1396,8 -1428,8 +1477,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "Audio CDa gehitu"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1693,8 -1725,8 +1774,8 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "Shell komando pertsonalizatuak konfiguratu"
+ msgid "Configure Custom Shell Commands"
+ msgstr ""
#. mpgmad
#: ../translation/extra.c:99
@@@ -1710,35 -1742,40 +1791,40 @@@ msgstr "Ken emuladorea Satoh-en gaineti
msgid "Enable surround"
msgstr "Surround gaitu"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Fitxategia dagoeneko existitzen da. Gainidatzi?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Bihurtzailearen abisua"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Mesedez hautatu kodetzailea"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Bihurtzailearen errorea"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Bihurtzen..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Hautatu karpeta..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Huts egin du kodetzailearen aurrezarpena gordetzean"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1746,79 -1783,79 +1832,79 @@@ msgstr "
"Egiaztatu aurrezarpenen karpetaren baimenak, erabili beste izen bat edo egin "
"leku librea diskoan"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
"Izen bereko aurrezarpen bat existitzen da dagoeneko. Aukeratu beste izenburu "
"bat."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Errorea"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Gehitu kodetzaile berria"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Editatu kodetzailea"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Kendu aurrezarpena"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Ekintza honek hautatutako aurrezarpena ezabatuko du. Ziur zaude?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Kodetzaileak"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Gehitu plugina DSP kateari"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Hutsegitea DSP aurrezarpena gordetzean"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "DSP aurrezarpen berria"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Editatu DSP aurrezarpena"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP aurrezarpenak"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Irteerako karpeta:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "Iturburu pista karpetan idatzi"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "Karpeta egitura mantendu"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Irteerako fitxategi-izena:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1828,89 -1865,89 +1914,89 @@@ msgstr "
"Luzapena (adibidez, .mp3) automatikoki gehituko da.\n"
"Utzi eremua hutsik balio lehenetsia erabiltzeko (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Kodetzailea:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP aurrezarpena:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Hari kopurua:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Irteerako lagin-formatua:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Mantendu iturburuko formatua"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 biteko zeinudun osokoa"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 biteko zeinudun osokoa"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 biteko zeinudun osokoa"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 biteko zeinudun osokoa"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 biteko koma mugikorreko zenbakia"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Fitxategia existitzen denean:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Gonbita"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Gainidatzi"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Editatu kodetzailearen aurrezarpena"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Kodetzaile izengabeak"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Irteerako fitxategiaren luzapena:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Adibidez, mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Komando-lerroa:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1921,7 -1958,7 +2007,7 @@@ msgstr "
"%i sarrerako fitxategiarentzat, %o irteerako fitxategiarentzat, - irteera "
"estandarrarentzat"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1931,66 -1968,72 +2017,72 @@@ msgstr "
"<small>%o - irteerako fitxategi-izena\n"
"%i - aldi baterako sarrerako fitxategi-izena</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Metodoa:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Kanalizazioa"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Aldi baterako fitxategia"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Etiketa idazlea</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "DSP aurrezarpenen editorea"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Izenbururik gabeko DSP aurrezarpena"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Gehitu"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Ezin izan da pixmap fitxategia aurkitu: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2028,27 -2071,27 +2120,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "Shell komando pertsonalizatuak"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "Editatu"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "Itxi"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "Editatu komandoa"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "Komandoa:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2060,17 -2103,17 +2152,17 @@@ msgstr "
"testuinguruan exekutatuko da. Titulu formatua erabili daiteke. Adibidez: xdg-"
"open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "IDa:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "Era-libreko izena, adibidez \"Nire Shell Komandoa\""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
@@@ -2079,57 -2122,57 +2171,57 @@@ msgstr "
"Komandu IDa, normalean zerbait motza, adibidez \"youtube_open\". Izen soila "
"izan behar du."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "Banakako Pistak"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "Banakako pistan badabil."
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "Pista Anitzak"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "Pista anitzetan badabil."
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "Lokala"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "Fitxategi lokaletan badabil."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "Urruneko"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "Urruneko fitxategietan badabil (adib. http:// streams)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "Elementua menu nagusian agertu behar da"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2137,72 -2180,72 +2229,76 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "Komandoa Gehitu"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "Ezabatu"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr "Ekintza honek hautatutako komandoa ezabatuko du. Ziur al zaude?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "Berretsi Ezabatu"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "IDa ezin da hutsik egon eta bakarra izan behar da.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "Izenburua ezin da hutsik egon.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "Shell Komandoa ezin da hutsik egon.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "Balio Baliogabeak"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "Onartutako soinu formatuak"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "Fitxategi guztiak (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "Ireki fitxategia(k)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "Fitxategia(k) erreprodukzio-zerrendara gehitu..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "Karpeta(k) erreprodukzio-zerrendara gehitu..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "Symlink-ak segi"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr "help.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "Fitxategiak diskotik ezabatu"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2210,19 -2253,19 +2306,19 @@@ msgstr "
"FItxategiak galdu egingo dira. Jarraitu?\n"
"(Hizketa hau GTK UI plugin aukeretan desgaitu daiteke)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "Erreprodukzio zerrenda kargatu"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "Beste fitxategiak (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "Erreprodukzio-zerrenda ... gisa gorde"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "DeaDBeeF erreprodukzio-zerrenda fitxategiak (*.dbpl)"
@@@ -2249,102 -2292,111 +2345,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/fa.po
index 6447557,1f1da24..1af4eda
--- a/po/fa.po
+++ b/po/fa.po
@@@ -9,9 -9,9 +9,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Persian (http://www.transifex.com/projects/p/deadbeef-player/"
"language/fa/)\n"
"Language: fa\n"
@@@ -20,17 -20,17 +26,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "درباره DeaDBeef %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "گزارش تغییرات %s DeaDBeeF"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr ""
@@@ -87,789 -87,816 +93,828 @@@ msgstr "صÙر کردن پیش تقوی
msgid "Zero Bands"
msgstr "نوارهای صÙر"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "۱ روز %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d روز %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "متوقÙ| %d آهنگ| %s Ú©Ù„ زمان پخش"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "تک کاناله"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "تک کاناله"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "استریو"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d کیلو بیت بر ثانیه"
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "مکث کرده|"
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dهرتز | %d بیت | %s | %d:%02d / %s | %d آهنگ | %s کل زمان پخش"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "لیست پخش جدید"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "لیست پخش جدید (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "شکست در خواندن Ùایل Ú©Ù…Ú©"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "شکست در بارگذاری Ùایل Ú©Ù…Ú©"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "هشدار"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_ پرونده"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_باز کردن پرونده(ها)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "اÙزودن پرونده(ها)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "اÙزودن پوشه(ها)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "اÙزودن Ù…ØÙ„"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "لیست پخش جدید"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "بارگذاری لیست پخش"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "ذخیره لیست پخش"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_ خروج"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_ویرایش"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_ پاک سازی"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "انتخاب همگی"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "از انتخاب درآوردن همگی"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "انتخاب معکوس"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "انتخاب"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "ØØ°Ù"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Ù…Øصول"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_یاÙتن"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "عنوان"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr ""
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "آلبوم"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "هنرمند"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr ""
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "اتÙاقی"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "شخصی"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "تنظیمات"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_نما"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "نوار وضعیت"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "اکولایزر"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_پخش"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "ترتیب"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "خطی"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr ""
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr ""
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Øلقه‌ زنی"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "پیمایش،پخش را دنبال می‌کند"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "مکان نما پخش را دنبال می‌کند"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "توق٠پس از کنونی"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr ""
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_ Ú©Ù…Ú©"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_تغییرات"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr ""
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_درباره"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr ""
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "جستجوی"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "توقÙ"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "پخش"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Ù…Ú©Ø«"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "قبلی"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "بعدی"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "پخش اتÙاقی"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "درباره"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "خروج"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Ú©Ù…Ú©"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "ویژگی آهنگ"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "ـ اعمال"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "ـ بستن"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Ùرا داده"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "ویژگی‌ها"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "عنوان:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "ستون عنوان جدید را اینجا وارد کنید"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "نوع:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr ""
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "در Øال پخش"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "آلبوم هنری"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "هنرمند-آلبوم"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "مدت زمان"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr ""
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "هنرمند آلبوم/گروه"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "قالب:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "هم‌ترازی:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Ú†Ù¾"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "راست"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "ـ لغو"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "ـ قبول"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "اÙزونه خروجی:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "دستگاه خروجی:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "صوت"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Øالت پخش مجدد:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "غیرÙعال"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "آهنگ"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "پخش مجدد مقیاس قله"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr "اÙزودن Ùایل‌ها از خط Ùرمان (‌یا مدیر Ùایل) به این Ùهرست پخش:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "ادامه نشست قبلی در این آغاز به کار"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr ""
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "پخش"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "پیکره‌بندی:"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr ""
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr ""
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr ""
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "بستن Øداقل شده‌ها برای رÙتن به سینی"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "مخÙÛŒ کردن آیکون سینی سیستم"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "متن نوار عنوان در زمان پخش:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "متن نوار عنوان در زمان توقÙ:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "مخÙÛŒ کردن متن «Øذ٠از دیسک» از منو"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "غلبه"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "پیش زمینه"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "پس‌زمینه"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "رنگ‌های نوار پویش/ Øجم صدا"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "متوسط"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "روشن"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "تیره"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "پایه"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "متن"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "رنگ‌های نوار لبه"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "غلبه (درختواره GTK ضعی٠می‌شود اما سرعت نمایش اÙزایش می‌یابد)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "ردی٠زوج"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "ردی٠Ùرد"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "ردی٠انتخاب شده"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "متن انتخاب شده"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "مکان‌نما"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "رنگ‌های Ùهرست پخش"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "رنگ‌ها"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Ùعال سازی خادم پروکسی"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "آدرس سرویس دهنده پروکسی:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "درگاه سرویس دهنده پروکسی:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "نوع پروکسی:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "نام کاربری پروکسی:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "گذرواژه پروکسی:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "شبکه"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -877,122 -904,128 +922,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr ""
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr ""
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "اÙزونه‌ها"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "آدرس اینترنتی:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr ""
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "بنویسید ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "بنویسید ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "بنویسید APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "ID3v2 را پاک کنید"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "ID3v1 را پاک کنید"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "APEv2 را پاک کنید"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "نسخه ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "۲٫۳ (پیشنهاد شده)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "Û²Ù«Û´"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "کدگشایی کاراکتر ID3v1 (پیش‌Ùرض iso8859-1 است)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "بنویسید ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1000,91 -1033,100 +1051,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "هنرمند/آلبوم"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "شماره آهنگ"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "اÙزودن به ص٠پخش"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Øذ٠از ص٠پخش"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "بارگذاری مجدد ابرداده"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Øذ٠از دیسک"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "اÙزودن ستون"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "ویرایش ستون"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Øذ٠ستون"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "گروه با"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "هیچ"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "هنرمند/تاریخ/آلبوم"
@@@ -1101,11 -1143,11 +1165,11 @@@ msgstr "
msgid "Default Audio Device"
msgstr "دستگاه صوتی پیش‌Ùرض"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1113,7 -1155,7 +1177,7 @@@
msgid "Adding files..."
msgstr "اÙزودن Ùایل‌ها..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "آماده سازی اولیه..."
@@@ -1126,139 -1168,139 +1190,149 @@@ msgid "Really close the window?
msgstr "واقعا می‌خواهید پنجره را ببندید؟"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "کلید"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "کلید"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "مقدار"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr ""
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "گزینه‌ها: \n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr "--help یا -h کمک(این پیام) را نشان می‌دهد و خارج می‌شود \n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr "--quit از پخش کننده خارج می‌شود \n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr "--version اطلاعات نسخه را نمایش می‌دهد و خارج می‌شود \n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr "--play پخش را آغاز می‌کند\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr "--stop پخش را متوق٠می‌کند\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr "--pause پخش را مکث می‌دهد\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr ""
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr "--next آهنگ بعدی در Ùهرست پخش\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr "--prev آهنگ قبلی در Ùهرست پخش\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr "--random آهنگ اتÙاقی در Ùهرست پخش\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr "--queue پیوست کردن پرونده(ها) به Ùهرست پخش موجود\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr "--nowplaying FMT چاپ نام آهنگ قالب‌بندی شده در خروجی استاندارد\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1269,33 -1311,31 +1343,43 @@@ msgstr "
" [م]دت زمان، شم[ا]ره آهنگ، [س]ال،[ن]ظر،\n"
" ØÙ‚[Ù†]شر،[س]پری شده\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
"- title\"\n"
msgstr "مثال: \"%%a - %%t\" باید \"هنرمند-عنوان\" را چاپ کند\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "پیش‌Ùرض"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "بله"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "پیش‌Ùرض"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "بله"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "خیر"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1310,7 -1350,7 +1394,7 @@@
"Custom"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1318,7 -1358,7 +1402,7 @@@ msgstr "
"Ú†Ù¾\n"
"راست"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1328,13 -1368,13 +1412,13 @@@ msgstr "
"آهنگ\n"
"آلبوم"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1342,14 -1382,7 +1426,7 @@@ msgstr "
"۲٫۳ (توصیه شده)\n"
"Û²Ù«Û´"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "پرونده تصویر بیتی پیدا نشد:%s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1361,7 -1394,7 +1438,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1654,7 -1687,7 +1731,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1671,111 -1704,116 +1748,116 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr ""
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr ""
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr ""
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr ""
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr ""
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr ""
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr ""
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr ""
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr ""
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr ""
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1783,89 -1821,89 +1865,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr ""
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr ""
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr ""
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr ""
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr ""
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1873,7 -1911,7 +1955,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1881,66 -1919,72 +1963,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr ""
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr ""
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr ""
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr ""
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr ""
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr ""
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr ""
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "اÙزودن"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "پرونده تصویر بیتی پیدا نشد:%s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1968,27 -2012,27 +2056,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -1997,74 -2041,74 +2085,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2072,90 -2116,90 +2160,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2182,102 -2226,111 +2274,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/fi.po
index 036751b,950b627..a200cd1
--- a/po/fi.po
+++ b/po/fi.po
@@@ -3,13 -3,15 +3,21 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+ # elain1 <heikki.auvinen at gmail.com>, 2014
+ # elain1 <heikki.auvinen at gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Finnish (http://www.transifex.com/projects/p/deadbeef-player/"
"language/fi/)\n"
"Language: fi\n"
@@@ -18,17 -20,17 +26,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Tietoja ohjelmasta DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s:n muutosloki"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeFin kääntäjät"
@@@ -85,1009 -87,1061 +93,1077 @@@ msgstr "Nollaa esivahvistin
msgid "Zero Bands"
msgstr "Nollaa kanavat"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Esiasetukset"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 päivä %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d päivää %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Pysäytetty | %d raitaa | kokonaiskesto %s"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d Kb/s "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Keskeytetty | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d bittiä | %s | %d:%02d / %s | %d raitaa | kokonaiskesto %s"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Uusi soittolista"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Uusi soittolista (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
- msgstr ""
+ msgstr "Soittolista välilehdillä"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
- msgstr ""
+ msgstr "Soittolista"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
- msgstr ""
+ msgstr "Jakaja (ylä- ja alapuoli)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
- msgstr ""
+ msgstr "Jakaja (vasen ja oikea)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
- msgstr ""
+ msgstr "Soittolista välilehdet"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
- msgstr ""
+ msgstr "Valinnan ominaisuudet"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
- msgstr ""
+ msgstr "Albumin kuvituksen näyttö"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
- msgstr ""
+ msgstr "Oskilloskooppi"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
- msgstr ""
+ msgstr "Spektri"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
- msgstr ""
+ msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
- msgstr ""
+ msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
+ msgstr "Painike"
+
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Virhe ohjetiedostoa avattaessa"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Ohjetiedoston avaaminen epäonnistui"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
- msgstr ""
+ msgstr "Haluatko silti poistua?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Varoitus"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Tiedosto"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Avaa tiedosto(ja)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Lisää tiedosto(ja)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Lisää hakemisto(ja)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Lisää sijainti"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Uusi soittolista"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Avaa soittolista"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Tallenna soittolista"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Lopeta"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Muokkaa"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Tyhjennä"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Valitse kaikki"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Poista valinta"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Käännä valinta"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Valinta"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Poista"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Rajaa"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Etsi"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
- msgstr ""
+ msgstr "Järjestä"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Nimi"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Raidan numero"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Albumi"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artisti"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Päivämäärä"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Satunnainen"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Mukautettu"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Asetukset"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Näytä"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Tilapalkki"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Taajuuskorjain"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
- msgstr ""
+ msgstr "Suunnittelutila"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "T_oisto"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Järjestys"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Lineaarinen"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Sekoita raitoja"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Sekoita albumeita"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Toisto"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
- msgstr ""
+ msgstr "Toista kaikki"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
- msgstr ""
+ msgstr "Toista yksittäistä kappaletta"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
- msgstr ""
+ msgstr "Älä toista"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Vieritys seuraa toistoa"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Hiiri seuraa toistoa"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Pysäytä tämän kappaleen jälkeen"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Hyppää nykyiseen raitaan"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Ohje"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Muutosloki"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Tietoja"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Kääntäjät"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Etsi"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Pysäytä"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Soita"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Tauko"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Edellinen"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Seuraava"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Toista satunnainen"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Tietoja"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Lopeta"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Ohje"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Raidan ominaisuudet"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
- msgstr ""
+ msgstr "Sijainti:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Asetukset"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Käytä"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Sulje"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metatiedot"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Ominaisuudet"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Nimi:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Anna uuden rivin otsikko"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Tyyppi:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "KOhteen indeksi"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Soitetaan"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Albumin Kuvitus"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Artisti - Albumi"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Kesto"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Raidan Numero"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Yhtye / Albumin artisti"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Tiedostomuoto:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Kohdistus:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Vasen"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Oikea"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Peruuta"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Ulostuloliitännäinen:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Ulostulolaite:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Muunna aina 8-bittinen ääni 16-bittiseksi"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
- msgstr ""
+ msgstr "Muunna aina 16-bittinen ääni 24-bittiseksi"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Ääni"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Replaygain-tila:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Pois päältä"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Raita"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Replaygain-huippuskaala"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Replaygain-esivahvistus:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Yleinen esivahvistus:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Lisää tiedostoja komentoriviltä (tai tiedostonhallinnasta) tähän "
"soittolistaan:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Palauta edellinen istunto käynnistyksessä"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Älä lisää arkistoista lisättäessä kansioita"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Toisto"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Tee asetukset"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP ketjuesiasetus"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Lataa"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Pienennä ilmaisinalueelle suljettaessa"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Piilota ilmaisinalueen kuvake"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
+ "Ota käyttöön CP1251 -merkistökoodauksen tunnistus ja muuntaminen (venäjä)"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
+ "Ota käyttöön CP936 -merkistökoodauksen tunnistus ja muuntaminen (kiina)"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Käyttöliittymän päivitysnopeus (kertaa sekunnissa):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Otsikkopalkin teksti toistettaessa:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Otsikkopalkin teksti, kun toisto on pysäytetty:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
"Käyttöliittymäliitännäinen (vaihtaminen vaatii ohjelman "
"uudellenkäynnistyksen):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
- msgstr ""
+ msgstr "Soitin"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
- msgstr ""
+ msgstr "Sulje soittolistoja hiiren keskimmäisellä painikkeella"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
- msgstr ""
+ msgstr "Näytä soiva raita lihavoituna"
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Piilota \"Poista levyltä\"-kontekstivalinta"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Nimeä soittolista automaattisesti lisättäessä yksittäinen kansio"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
- msgstr ""
+ msgstr "Sovita sarakkeet ikkunaan"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
- msgstr ""
+ msgstr "GUI/Sekalainen"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Ohita"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Etuala"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Tausta"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Etsintä-/äänenvoimakkuuspalkin värit"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Keski"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Kevyt"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Tumma"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Pohja"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Teksti"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Välilehden värit"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"Ohita asetus (GTKn treeview-teema menetetään, mutta nopeuttaa renderöintiä)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Parillinen rivi"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Pariton rivi"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Valittu rivi"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Valittu teksti"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Hiiriosoitin"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Soittolistojen värit"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Värit"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Ota käyttöön välityspalvelin"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Välityspalvelimen osoite:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Välityspalvelimen portti:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Välityspalvelimen tyyppi:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Välityspalvelimen käyttäjänimi:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Välityspalvelimen salasana:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
- msgstr ""
+ msgstr "HTTP User Agent:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
- msgstr ""
+ msgstr "Muokkaa sisältötyypin kartoitusta"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Verkko"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
- msgstr ""
+ msgstr "Määritellyt pikanäppäimet:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
- msgstr ""
+ msgstr "Toiminto:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
- msgstr ""
+ msgstr "<Ei ole asetettu>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
- msgstr ""
+ msgstr "Näppäinyhdistelmä:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
- msgstr ""
+ msgstr "Yleinen pikanäppäin"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
"The changes will NOT be saved\n"
"if you don't press Apply."
msgstr ""
+ "Tallenna muutokset Käytä painikkeella,\n"
+ "tai peruuta muutokset Palauta painikkeella.\n"
+ "Muutoksia EI tallenneta\n"
+ "jos et paina Käytä painiketta."
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
- msgstr ""
+ msgstr "_Oletukset"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
- msgstr ""
+ msgstr "Pikanäppäimet"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Versio: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Tekijänoikeus"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Liitännäiset"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
- msgid "Group By ..."
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+ msgid "Group By ..."
+ msgstr "Ryhmitä..."
+
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
- msgstr ""
+ msgstr "Järjestä..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Tiedostomuoto"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Nouseva"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Laskeva"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Valitse DSP-liitännäinen"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Liitännäinen"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Tagikirjoittajan asetukset"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Kirjoita ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Kirjoita ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Kirjoita APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Poista ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Poista ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Poista APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 versio"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (suositeltu)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1-merkistökoodaus (oletus: iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Kirjoita ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
- msgstr ""
+ msgstr "Sisältötyypin kartoitus"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
"plugin, or \"ffmpeg\" plugin."
msgstr ""
+ "Tämä taulukko määrittää verkon suoratoiston sisältötyypin ja DeaDBeeFin "
+ "dekooderiliitännäisten sidoksen. Esimerkiksi, mp3-tiedostot voivat olla "
+ "sisältötyypiltään \"audio/x-mpeg\", ja ne pitää dekoodata joko DeaDBeeFin "
+ "omalla \"stdmpg\"-liitännäisellä tai \"ffmpeg\"-liitännäisellä."
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
- msgstr ""
+ msgstr "Palauta oletukset"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
- msgstr ""
+ msgstr "Sisällön-Tyyppi:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
- msgstr ""
+ msgstr "Liitännäiset"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
- msgstr ""
+ msgstr "Painikkeen ominaisuudet"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
- msgstr ""
+ msgstr "Väri:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
- msgstr ""
+ msgstr "Tekstin väri"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
- msgstr ""
+ msgstr "Kuvake:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
- msgstr ""
+ msgstr "Nimike:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
+ msgstr "Valitse toiminto"
+
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Artisti / Albumi"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Raita nro"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Lisää toistojonoon"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Poista toistojonosta"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Lataa metatiedot uudelleen"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Poista levyltä"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Lisää sarake"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Muokkaa saraketta"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Poista sarake"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
- msgstr ""
+ msgstr "Kiinnitä ryhmät vierittäessä"
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Ryhmittele"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Ei mitään"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Artisti/Pvm/Albumi"
@@@ -1104,19 -1158,19 +1180,19 @@@ msgstr "Tee asetukset %s
msgid "Default Audio Device"
msgstr "Oletusäänilaite"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
- msgstr ""
+ msgstr "Muokkasit pikanäppäinasetuksia, mutta et tallentanut muutoksiasi."
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
- msgstr ""
+ msgstr "Haluatko varmasti jatkaa ilman tallentamista?"
#: ../plugins/gtkui/progress.c:56
msgid "Adding files..."
msgstr "Lisätään tiedostoja..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Alustetaan..."
@@@ -1129,102 -1183,102 +1205,112 @@@ msgid "Really close the window?
msgstr "Haluatko varmasti sulkea tämän ikkunan?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Useita arvoja] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Avain"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Avain"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Arvo"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
- msgstr ""
+ msgstr "[Useita arvoja]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Kirjoitetaan tageja..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
- msgstr ""
+ msgstr "Kentän nimi"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Nimi:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Tiedostonimet eivät voi alkaa merkeillä : tai _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Kenttää ei voi lisätä"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Samanniminen kenttä on jo olemassa, yritä toista nimeä."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Lisää kenttä"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Poista kentät"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
- msgstr ""
+ msgstr "Käyttö: deadbeef [asetukset] [--] [tiedosto(t)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Valitsimet:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help tai -h Näytä ohje (tämä viesti) ja poistu\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Sulje soitin\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Näytä versiotiedot ja poistu\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Aloita toisto\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Pysäytä toisto\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Keskeytä toisto\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Vaihda keskeytyksen ja toiston välillä\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1232,39 -1286,41 +1318,41 @@@ msgstr "
" --play-pause Aloita toisto, jos pysäytetty, muuten vaihda "
"keskeytyksen ja toiston välillä\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Seuraava kappale soittolistalla\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Edellinen kappale soittolistalla\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Satunnainen kappale soittolistalla\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr ""
" --queue Lisää tiedosto(t) olemassa olevaan soittolistaan\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
+ "--gui PLUGIN Kertoo mitä graafisen käyttöliittymän liitännäistä käytetään, "
+ "oletus on \"GTK2\"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Tulosta muotoiltu raidan nimi stdoutiin\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1275,7 -1331,7 +1363,7 @@@ msgstr "
" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
" copy[r]ight, [e]lapsed\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1284,28 -1340,24 +1372,36 @@@ msgstr "
" esim.: --nowplaying \"%%a - %%t\" tulostaa \"artisti - "
"otsikko\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " lisätietoja osoitteessa http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Oletus"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Kyllä"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Oletus"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Kyllä"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Ei"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1331,7 -1383,7 +1427,7 @@@ msgstr "
"Bändi / Albumin artisti\n"
"Mukautettu"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1339,7 -1391,7 +1435,7 @@@ msgstr "
"Vasen\n"
"Oikea"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1349,7 -1401,7 +1445,7 @@@ msgstr "
"Raita\n"
"Albumi"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1357,7 -1409,7 +1453,7 @@@ msgstr "
"Nouseva\n"
"Laskeva"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1365,14 -1417,7 +1461,7 @@@ msgstr "
"2.3 (suositeltu)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Bittikarttatiedostoa ei löydetty: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1385,7 -1430,7 +1474,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1395,7 -1440,7 +1484,7 @@@ msgstr "Etsi Last.fm-palvelusta
#. ALSA output plugin
#: ../translation/extra.c:6
msgid "Use ALSA resampling"
- msgstr ""
+ msgstr "Käytä ALSA:n uudelleennäytteistystä"
#: ../translation/extra.c:7
msgid "Release device while stopped"
@@@ -1403,11 -1448,11 +1492,11 @@@ msgstr "Vapauta laite, kun toisto on lo
#: ../translation/extra.c:8 ../translation/extra.c:55
msgid "Preferred buffer size"
- msgstr ""
+ msgstr "Ensisijainen puskurin koko"
#: ../translation/extra.c:9
msgid "Preferred period size"
- msgstr ""
+ msgstr "Ensisijainen jakson koko"
#. Last.fm plugin
#: ../translation/extra.c:11
@@@ -1432,7 -1477,7 +1521,7 @@@ msgstr "Scrobble URL
#: ../translation/extra.c:16
msgid "Prefer Album Artist over Artist field"
- msgstr ""
+ msgstr "Suosi Albumin artistia Artisti-kentän edelle"
#. OSS output plugin
#: ../translation/extra.c:18
@@@ -1441,7 -1486,7 +1530,7 @@@ msgstr "Laitetiedosto
#: ../translation/extra.c:19
msgid "OSS4 samplerate bug workaround"
- msgstr ""
+ msgstr "OSS4 näytteenottotaajuusongelman kiertäminen"
#. Album Artwork plugin
#: ../translation/extra.c:21
@@@ -1458,7 -1503,7 +1547,7 @@@ msgstr "Nouda paikallisesta kansiosta
#: ../translation/extra.c:24
msgid "Local cover file mask"
- msgstr ""
+ msgstr "Paikallinen peitetiedostomaski"
#: ../translation/extra.c:25
msgid "Fetch from last.fm"
@@@ -1500,11 -1545,11 +1589,11 @@@ msgstr "Ota käyttöön tuki NRG-levyku
#. DUMB module player plugin
#: ../translation/extra.c:36
msgid "Resampling quality (0..2, higher is better)"
- msgstr ""
+ msgstr "Uudelleennäytteistyksen laatu (0..2, suurempi on parempi)"
#: ../translation/extra.c:37
msgid "8-bit output (default is 16)"
- msgstr ""
+ msgstr "8-bittinen ulostulo (vakio on 16)"
#. Game_Music_Emu decoder plugin
#: ../translation/extra.c:39
@@@ -1513,11 -1558,11 +1602,11 @@@ msgstr "Kappaleen maksimipituus (minuut
#: ../translation/extra.c:40
msgid "Fadeout length (seconds)"
- msgstr ""
+ msgstr "Loppuhäivytyksen pituus (sekunneissa)"
#: ../translation/extra.c:41
msgid "Play loops nr. of times (if available)"
- msgstr ""
+ msgstr "Toistojen määrä (jos käytössä)"
#. Standard GTK2 user interface plugin
#: ../translation/extra.c:43
@@@ -1526,7 -1571,7 +1615,7 @@@ msgstr "Kysy vahvistus ennen kuin tiedo
#: ../translation/extra.c:44
msgid "Status icon volume control sensitivity"
- msgstr ""
+ msgstr "Ilmaisinaluekuvakkeen äänenvoimakkuuden säädön herkkyys"
#: ../translation/extra.c:45
msgid "Custom status icon"
@@@ -1538,16 -1583,16 +1627,16 @@@ msgstr "Suorita gtk_init --sync-valitsi
#: ../translation/extra.c:47
msgid "Add separators between plugin context menu items"
- msgstr ""
+ msgstr "Käytä erottajia liitännäisten kontekstivalintojen väleissä"
#. OSD Notify plugin
#: ../translation/extra.c:49
msgid "Notification title format"
- msgstr ""
+ msgstr "Ilmoituksen otsikon muoto"
#: ../translation/extra.c:50
msgid "Notification content format"
- msgstr ""
+ msgstr "Ilmoituksen sisällön muoto"
#: ../translation/extra.c:51
msgid "Show album art"
@@@ -1569,24 -1614,24 +1658,24 @@@ msgstr "Näytetaajuus
#. SHN player plugin
#: ../translation/extra.c:58
msgid "Relative seek table path"
- msgstr ""
+ msgstr "Suhteellinen hakutalukon polku"
#: ../translation/extra.c:59
msgid "Absolute seek table path"
- msgstr ""
+ msgstr "Absoluuttiinen hakutaulukon polku"
#: ../translation/extra.c:60
msgid "Swap audio bytes (toggle if all you hear is static)"
- msgstr ""
+ msgstr "Vaihda audiotavuja (käytä jos kuulet pelkkää kohinaa)"
#. SID decoder plugin
#: ../translation/extra.c:62
msgid "Enable HVSC Songlength DB"
- msgstr ""
+ msgstr "Ota käyttöön HVSC kappaleiden pituustietokanta"
#: ../translation/extra.c:63
msgid "Songlengths.txt (from HVSC)"
- msgstr ""
+ msgstr "HVSC:n songlengths.txt"
#: ../translation/extra.c:64
msgid "Bits per sample (8 or 16)"
@@@ -1599,7 -1644,7 +1688,7 @@@ msgstr "Kappaleen oletuspituus (sek)
#. WildMidi player plugin
#: ../translation/extra.c:67
msgid "Timidity++ bank configuration file"
- msgstr ""
+ msgstr "Timidity++ asetustiedosto"
#: ../translation/extra.c:70
msgid "Track Title"
@@@ -1639,11 -1684,11 +1728,11 @@@ msgstr "Sijainti
#: ../translation/extra.c:84
msgid "Subtrack Index"
- msgstr ""
+ msgstr "Aliraitaindeksi"
#: ../translation/extra.c:85
msgid "Tag Type(s)"
- msgstr ""
+ msgstr "Tagien tyypit"
#: ../translation/extra.c:86
msgid "Embedded Cuesheet"
@@@ -1666,140 -1711,148 +1755,148 @@@ msgstr "Muunna
#. Resampler (Secret Rabbit Code)
#: ../translation/extra.c:93
msgid "Target Samplerate"
- msgstr ""
+ msgstr "Tavoite näytteenottotaajuus"
#: ../translation/extra.c:94
msgid "Quality / Algorithm"
- msgstr ""
+ msgstr "Laatu / Algoritmi"
#: ../translation/extra.c:95
msgid "Automatic Samplerate (overrides Target Samplerate)"
msgstr ""
+ "Automaattinen näytteenottotaajuus (korvaa tavoite näytteenottotaajuuden)"
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
#: ../translation/extra.c:99
msgid "Disable gapless playback (faster scanning)"
- msgstr ""
+ msgstr "Ota tauoton toisto pois käytöstä (nopeampi skannaus)"
#. adplug
#: ../translation/extra.c:101
msgid "Prefer Ken emu over Satoh (surround won't work)"
- msgstr ""
+ msgstr "Suosi Ken-emulointia Satohin edelle (tilaääni ei toimi)"
#: ../translation/extra.c:102
msgid "Enable surround"
+ msgstr "Ota käyttöön tilaääni"
+
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Tiedosto on jo olemassa. Ylikirjoita?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
- msgstr ""
+ msgstr "Muuntimen varoitus"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Valitse koodekki"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
- msgstr ""
+ msgstr "Muuntimen virhe"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Muunnetaan..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Valitse kansio..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
- msgstr ""
+ msgstr "Enkooderin esiasetuksen tallentaminen epäonnistui."
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
+ "Tarkista esiasetuskansion käyttöoikeudet, yritä keksiä toinen nimi tai "
+ "vapauta levytilaa."
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
- msgstr ""
+ msgstr "Esiasetus samalla nimellä on jo olemassa. Yritä keksiä toinen nimi."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Virhe"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
- msgstr ""
+ msgstr "Lisää uusi enkooderi"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
- msgstr ""
+ msgstr "Muokkaa enkooderia"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Poista esiasetus"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
- msgstr ""
+ msgstr "Tämä toiminto poistaa valikoidun esiasetuksen. Oletko varma?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
- msgstr ""
+ msgstr "Enkooderit"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
- msgstr ""
+ msgstr "Lisää liitännäinen DSP-ketjuun"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
- msgstr ""
+ msgstr "DSP-esiasetuksen tallennus epäonnistui"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Uusi DSP-esiasetus"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Muokkaa DSP-esiasetusta"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP-esiasetukset"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
- msgstr ""
+ msgstr "Ulostulokansio:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
- msgstr ""
+ msgstr "Tallenna lähdekansioon"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
- msgstr ""
+ msgstr "Säilytä kansiorakenne"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
- msgstr ""
+ msgstr "Ulostulotiedoston nimi:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1809,89 -1862,89 +1906,89 @@@ msgstr "
"Tiedoston pääte (esim. .mp3) lisätään automaattisesti.\n"
"Jätettäessä tyhjäksi oletus on (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
- msgstr ""
+ msgstr "Enkooderi:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP-esiasetus:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
- msgstr ""
+ msgstr "Säikeiden määrä:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
- msgstr ""
+ msgstr "Ulostulon näytemuoto:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
- msgstr ""
+ msgstr "Pidä lähteen tiedostomuoto"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
- msgstr ""
+ msgstr "8 bit signed int"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
- msgstr ""
+ msgstr "16 bit signed int"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
- msgstr ""
+ msgstr "24 bit signed int"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
- msgstr ""
+ msgstr "32 bit signed int"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
- msgstr ""
+ msgstr "32 bit float"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Kun tiedosto on jo olemassa:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Kysy"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Ylikirjoita"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Muokkaa enkooderin esiasetusta"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
- msgstr ""
+ msgstr "Nimeämätön enkooderi"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
- msgstr ""
+ msgstr "Ulostulon tiedostopääte:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Esim. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Komentorivi:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1901,74 -1954,82 +1998,82 @@@ msgstr "
"Esimerkki: lame - %o\n"
"%i on sisääntulotiedosto, %o on ulostulotiedosto, - on stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
"<small>%o - output file name\n"
"%i - temporary input file name</small>"
msgstr ""
+ "<small>%o - ulostulotiedoston nimi\n"
+ "%i - väliaikaisen sisääntulotiedoston nimi</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
- msgstr ""
+ msgstr "Menetelmä:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
- msgstr ""
+ msgstr "Putki"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Tilapäinen tiedosto"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "Ogg Vorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
- msgstr ""
+ msgstr "<b>Tagikirjoittaja</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
- msgstr ""
+ msgstr "DSP-esiasetuksen muokkain"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
- msgstr ""
+ msgstr "Nimeämätön DSP-esiasetus"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Lisää"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Bittikarttatiedostoa ei löydetty: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1978,45 -2039,55 +2083,55 @@@
"32 bit signed int\n"
"32 bit float"
msgstr ""
+ "Pidä lähteen tiedostomuoto\n"
+ "8 bit signed int\n"
+ "16 bit signed int\n"
+ "24 bit signed int\n"
+ "32 bit signed int\n"
+ "32 bit float"
#: ../plugins/converter/converter.glade.h:19
msgid ""
"Prompt\n"
"Overwrite"
msgstr ""
+ "Kysy\n"
+ "Ylikirjoita"
#: ../plugins/converter/converter.glade.h:34
msgid ""
"Pipe\n"
"Temporary file"
msgstr ""
+ "Putki\n"
+ "Väliaikainen tiedosto"
#: ../plugins/shellexecui/interface.c:46
#: ../plugins/shellexecui/shellexec.glade.h:1
msgid "Custom Shell Commands"
- msgstr ""
+ msgstr "Mukautetut komentotulkkikomennot"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
- msgstr ""
+ msgstr "Muokkaa"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
- msgstr ""
+ msgstr "Sulje"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
- msgstr ""
+ msgstr "Muokkaa komentoa"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
- msgstr ""
+ msgstr "Komento:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2024,176 -2095,186 +2139,190 @@@
"main application was started from. Title formatting can be used. Example: "
"xdg-open %D"
msgstr ""
+ "Mielivaltainen komentotulkin komento. Suoritetaan samassa komentotulkin "
+ "kontekstissa jossa sovellus käynnistettiin. Otsikkomuotoilua voidaan "
+ "käyttää. Esimerkiksi: xdg-open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
- msgstr ""
+ msgstr "Tunniste:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
- msgstr ""
+ msgstr "Vapaamuotoinen nimi, esim. \"Minun komentotulkkikomentoni\""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
+ "Komennon tunnisteen tulisi normaalisti olla jotain lyhyttä, esim. "
+ "\"youtube_open\" ja sen täytyy olla uniikki."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
- msgstr ""
+ msgstr "Yksittäiset raidat"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
- msgstr ""
+ msgstr "Toimii yksittäisillä raidoilla"
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
- msgstr ""
+ msgstr "Useat raidat"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
- msgstr ""
+ msgstr "Toimii useilla raidoilla"
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
- msgstr ""
+ msgstr "Paikallinen"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
- msgstr ""
+ msgstr "Toimii paikallisilla tiedostoilla."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
- msgstr ""
+ msgstr "Etä"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
- msgstr ""
+ msgstr "Toimii etätiedostoilla (esim. http:// suoratoistot)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
- msgstr ""
+ msgstr "Yleinen (Päävalikko)"
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
- msgstr ""
+ msgstr "Kohteen pitäisi näkyä päävalikossa"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
"contains the menu path like this: \"File/My Command\", where File is the "
"menu name in the English version.</small>"
msgstr ""
+ "<small>Jos haluat lisätä komennon päävalikkoon, varmista että otsikko "
+ "sisältää valikkopolun tähän tapaan: \"File/Minun komentoni\", jossa File on "
+ "Tiedosto-valikon nimi englanninkielisessä versiossa.</small>"
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
- msgstr ""
+ msgstr "Lisää komento"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
- msgstr ""
+ msgstr "Poista"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
- msgstr ""
+ msgstr "Tämä toiminto poistaa valikoidun komentotulkkikomennon. Oletko varma?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
- msgstr ""
+ msgstr "Vahvista Poistaminen"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
- msgstr ""
+ msgstr "Tunnisteen pitää olla uniikki, eikä sitä saa jättää tyhjäksi.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
- msgstr ""
+ msgstr "Otsikko ei voi olla tyhjä.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
- msgstr ""
+ msgstr "Komentotulkkikomento ei voi olla tyhjä.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
- msgstr ""
+ msgstr "Virheellinen arvo"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
- msgstr ""
+ msgstr "Tuetut äänityypit"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
- msgstr ""
+ msgstr "Kaikki tiedostot (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
- msgstr ""
+ msgstr "Avaa tiedosto(ja)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
- msgstr ""
+ msgstr "Lisää tiedosto(ja) soittolistalle..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
- msgstr ""
+ msgstr "Lisää kansio(ita) soittolistalle..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
- msgstr ""
+ msgstr "Seuraa symbolisia linkkejä"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
- msgstr ""
+ msgstr "help.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
- msgstr ""
+ msgstr "Poisto tiedostot kiintolevyltä"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
+ "Tiedostot häviävät. Jatketaanko?\n"
+ "(Tämän valintaikkunan voi sammuttaa GTKUI-liitännäisen asetuksista)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
- msgstr ""
+ msgstr "Avaa Soittolista"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
- msgstr ""
+ msgstr "Muut tiedostot (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
- msgstr ""
+ msgstr "Tallenna Soittolista Nimellä"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
- msgstr ""
+ msgstr "DeaDBeeFin soittolistatiedostot (*.dbpl)"
#: ../plugins/gtkui/ctmapping.c:129
msgid "Content-Type"
- msgstr ""
+ msgstr "Sisällön-Tyyppi"
#: ../plugins/gtkui/ctmapping.c:199
msgid "Invalid value(s)."
- msgstr ""
+ msgstr "Virheellinen arvo."
#: ../plugins/gtkui/ctmapping.c:200
msgid ""
@@@ -2205,107 -2286,124 +2334,200 @@@
"Content type should be only letters, numbers and '-' sign.\n"
"Plugin id can contain only letters and numbers."
msgstr ""
+ "Sisällöntyyppi- ja liitännäiskentät eivät voi olla tyhjiä ja niiden pitää "
+ "noudattaa sääntöjä.\n"
+ "Esimerkiksi sisällöntyyppi: 'audio/mpeg'.\n"
+ "Esimerkiksi liitännäisten tunnisteet: 'stdmpg ffmpeg'.\n"
+ "Välilyöntiä tulee käyttää erottimena liitännäisten tunnisteita "
+ "listattaessa.\n"
+ "Sisällöntyyppi tulee olla ainoastaan kirjaimia, numeroita ja '-' merkki.\n"
+ "Liitännäisen tunniste voi sisältää ainoastaan kirjaimia ja numeroita."
#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
msgid "Nothing is selected."
+ msgstr "Mitään ei ole valittuna."
+
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
++=======
+ #: ../plugins/gtkui/widgets.c:772
++>>>>>>> upstream/0.6.2
msgid "Replace with..."
- msgstr ""
+ msgstr "Korvaa..."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:599
++=======
+ #: ../plugins/gtkui/widgets.c:777
++>>>>>>> upstream/0.6.2
msgid "Insert..."
- msgstr ""
+ msgstr "Lisää..."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:626
++=======
+ #: ../plugins/gtkui/widgets.c:804
++>>>>>>> upstream/0.6.2
msgid "Cut"
- msgstr ""
+ msgstr "Leikkaa"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:633
++=======
+ #: ../plugins/gtkui/widgets.c:811
++>>>>>>> upstream/0.6.2
msgid "Copy"
- msgstr ""
+ msgstr "Kopioi"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:640
++=======
+ #: ../plugins/gtkui/widgets.c:818
++>>>>>>> upstream/0.6.2
msgid "Paste"
- msgstr ""
+ msgstr "Liitä"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:764
++=======
+ #: ../plugins/gtkui/widgets.c:942
++>>>>>>> upstream/0.6.2
msgid "Multiple widgets of this type are not supported"
- msgstr ""
+ msgstr "Useammat tämän tyypin widgetit eivät ole tuettuja"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1071
++=======
+ #: ../plugins/gtkui/widgets.c:1249
++>>>>>>> upstream/0.6.2
msgid "Lock movement"
- msgstr ""
+ msgstr "Lukitse liikkuvuus"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1356
++=======
+ #: ../plugins/gtkui/widgets.c:1534
++>>>>>>> upstream/0.6.2
msgid "Move tab left"
- msgstr ""
+ msgstr "Siirrä välilehteä vasemmalle"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1363
++=======
+ #: ../plugins/gtkui/widgets.c:1541
++>>>>>>> upstream/0.6.2
msgid "Move tab right"
- msgstr ""
+ msgstr "Siirrä välilehteä oikealle"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1370
++=======
+ #: ../plugins/gtkui/widgets.c:1548
++>>>>>>> upstream/0.6.2
msgid "Remove tab"
- msgstr ""
+ msgstr "Poista välilehti"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1377
++=======
+ #: ../plugins/gtkui/widgets.c:1555
++>>>>>>> upstream/0.6.2
msgid "Rename tab"
- msgstr ""
+ msgstr "Nimeä välilehti"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1438
++=======
+ #: ../plugins/gtkui/widgets.c:1616
++>>>>>>> upstream/0.6.2
msgid "Add new tab"
- msgstr ""
+ msgstr "Lisää uusi välilehti"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1861
++=======
+ #: ../plugins/gtkui/widgets.c:2036
++>>>>>>> upstream/0.6.2
msgid "Show Column Headers"
- msgstr ""
+ msgstr "Näytä sarakkeiden otsakkeet"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:2969
++=======
+ #: ../plugins/gtkui/widgets.c:3147
++>>>>>>> upstream/0.6.2
msgid "Expand the box by 1 item"
- msgstr ""
+ msgstr "Laajenna laatikkoa 1:llä elementillä"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:2974
++=======
+ #: ../plugins/gtkui/widgets.c:3152
++>>>>>>> upstream/0.6.2
msgid "Shrink the box by 1 item"
- msgstr ""
+ msgstr "Pienennä laatikkoa 1:llä elementillä"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:2979
++=======
+ #: ../plugins/gtkui/widgets.c:3157
++>>>>>>> upstream/0.6.2
msgid "Homogeneous"
- msgstr ""
+ msgstr "Yhtenäinen"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3019
++=======
+ #: ../plugins/gtkui/widgets.c:3197
++>>>>>>> upstream/0.6.2
msgid "Expand"
- msgstr ""
+ msgstr "Laajenna"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3027
++=======
+ #: ../plugins/gtkui/widgets.c:3205
++>>>>>>> upstream/0.6.2
msgid "Fill"
- msgstr ""
+ msgstr "Täytä"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
+ msgstr "Tee painikkeen asetukset"
+
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
msgstr ""
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
- msgstr ""
+ msgstr "Muokka soittolistaa"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
- msgstr ""
+ msgstr "Nimeä Soittolista"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
- msgstr ""
+ msgstr "Poista Soittolista"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
- msgstr ""
+ msgstr "Lisää Uusi Soittolista"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
- msgstr ""
+ msgstr "Nimi"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
- msgstr ""
+ msgstr "Soittolistaselain"
diff --combined po/fr.po
index 96d3741,b745797..084e18c
--- a/po/fr.po
+++ b/po/fr.po
@@@ -6,13 -6,15 +6,21 @@@
# Olowen Cilyan <gaknar at gmail.com>, 2010
# iceTwy <icetwy at inventati.org>, 2013
# Olowen Cilyan <gaknar at gmail.com>, 2010
+ # Superboa <superboa at hotmail.fr>, 2014
+ # Superboa <superboa at hotmail.fr>, 2014
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: French (http://www.transifex.com/projects/p/deadbeef-player/"
"language/fr/)\n"
"Language: fr\n"
@@@ -21,17 -23,17 +29,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "À propos de DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "Notes de version pour DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Traducteurs de DeaDBeeF"
@@@ -88,44 -90,44 +96,52 @@@ msgstr "Pré-ampli à zéro
msgid "Zero Bands"
msgstr "Bandes à zéro"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Préréglages"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 jour %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d jours %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Arrêté | %d pistes | %s de temps d'écoute total"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stéréo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "En pause | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -133,963 -135,1016 +149,1024 @@@ msgstr "
"%s%s %s| %d Hz | %d bit | %s | %d:%02d / %s | %d pistes | %s de temps "
"d'écoute total"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Nouvelle liste de lecture"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Nouvelle liste de lecture (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Liste de lecture avec onglet"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Liste de lecture"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "Séparateur (haut et bas)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "Séparateur (droit et gauche)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Onglets des listes de lecture"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Propriétés de la sélection"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Affichage de la couverture de l'album"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "Portée"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "Spectre"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Bouton"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr "Barre de lecture"
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr "Barre de volume"
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Échec à la lecture du fichier d'aide"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Échec à l'ouverture du fichier d'aide"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
+ "Le lecteur est actuellement actif en tâche de fond. Si vous quittez "
+ "maintenant, les tâches seront ignorées ou interrompues. Cela peut provoquer "
+ "des pertes de données."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "Voulez-vous toujours quitter ?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Avertissement"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Fichier"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Ouvrir un (des) fichier(s)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Ajouter un (des) fichier(s)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Ajouter un (des) dossier(s)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Ajouter un emplacement"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nouvelle liste de lecture"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Charger une liste de lecture"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Enregistrer la liste de lecture"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Quitter"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "Édit_er"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Effacer"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Tout sélectionner"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Tout désélectionner"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Inverser la sélection"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Sélection"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Enlever"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Découper"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Rechercher"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Classer par"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Titre"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Numéro de piste"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artiste"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Date"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Aléatoire"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Personnalisé"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Préférences"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Affichage"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Barre d'état"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Égaliseur"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "Mode design"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Lecture"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Ordre"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Linéaire"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Mélanger les pistes"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Mélanger les albums"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Boucler"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Tout répéter"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Répéter une seule piste"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Ne pas répéter"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Le défilement suit la lecture"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "La sélection suit la lecture"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Arrêter après la piste actuelle"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr "Arrêter après l'album actuel"
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Passer à la prochaine piste"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Aide"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Notes de version"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "À pr_opos"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Traducteurs"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Rechercher"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Stop"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Lire"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pause"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Précédent"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Suivant"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Lecture aléatoire"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "À propos"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Quitter"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Aide"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Propriétés de la piste"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "Location:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Paramètres"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Appliquer"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Fermer"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Métadonnée"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Propriétés"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Titre :"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Entrez le nom de la nouvelle colonne ici"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Type :"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Index de l'item"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Lecture"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Couverture de l'album"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Artiste - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Durée"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Numéro de Piste"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Groupe / Artiste de l'album"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Format :"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Alignement :"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Gauche"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Droite"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "A_nnuler"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_Valider"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Greffon de sortie :"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Périphérique de sortie :"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Toujours convertir l'audio 8 bits à 16 bits"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr "Toujours convertir l'audio 16 bits à 24 bits"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Son"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Mode du ReplayGain (ajustement du volume) :"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Désactiver"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Piste"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Ajustement des crêtes par ReplayGain"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Préampli Replaygain:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Préampli global:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Ajouter des fichiers à cette liste de lecture depuis la ligne de commande "
"(ou le gestionnaire de fichier) :"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Charger la session précédente au démarrage"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Ne pas ajouter depuis des archives pendant l'ajout de dossiers"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "Automatiquement remettre \"Arrêter après la piste actuelle\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Lecture"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Configurer"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Réglage de la chaîne DSP"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Charger"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Fermer la fenêtre la réduit dans la zone de notification"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Masquer l'icône de notification"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "Activer la détection et le ré-encodage du Russe CP1251 "
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Activer la détection et le ré-encodage du Chinois CP936"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Taux de rafraîchissement de l'interface (fois par seconde):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Barre de titre en lecture :"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Barre de titre à l'arrêt :"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "Plugin du GUI (tout changement nécessite un redémarrage):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
- msgstr ""
+ msgstr "Lecteur"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
- msgstr ""
+ msgstr "fermer les listes de lecture avec le bouton du milieu de la souris"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
- msgstr ""
+ msgstr "Afficher la piste courante en utilisant des caractères gras"
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
msgstr "Masquer l'entrée \"Supprimer du disque\" du menu contextuel"
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
"Nommer automatiquement les listes de lecture à l'ajout d'un seul dossier"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
- msgstr ""
+ msgstr "Adapter automatiquement les colonnes à la fenêtre"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "GUI/Divers"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Redéfinir"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Premier plan"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Arrière-plan"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Couleurs de la barre de lecture/échelle du volume"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Fond"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Clair"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Sombre"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Base"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Texte"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Couleur des onglets"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "Redéfinir (perd le thème des listes GTK, mais accélère le rendu)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Lignes paires"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Lignes impaires"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Ligne sélectionnée"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Texte sélectionné"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Curseur"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Couleurs des listes de lecture"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Couleurs"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Activer le serveur mandataire"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Adresse du serveur mandataire :"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Port du serveur mandataire :"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Type de serveur mandataire :"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Nom d'utilisateur sur le serveur mandataire :"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Mot de passe sur le serveur mandataire :"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "HTTP User Agent:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "Editer le Content-Type Mapping"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Réseau"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr "Raccourcis clavier définis:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr "Action:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<Non défini>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr "Combinaison de touches:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Raccourci général"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
"The changes will NOT be saved\n"
"if you don't press Apply."
msgstr ""
+ "Utiliser le bouton Appliquer pour sauvegarder les modifications, \n"
+ "ou le bouton Rétablir pour les annuler.\n"
+ "Les changements ne seront pas sauvegardés \n"
+ "si vous ne cliquez pas sur Appliquer."
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
- msgstr ""
+ msgstr "_Défauts"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "Raccourcis"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Version:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Copyright"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Greffons"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URLÂ :"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "Grouper par..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "Classer par..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Format"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Ascendant"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Descendant"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Choisir le plugin DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Greffon"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Paramètres de l'éditeur de tags"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Écrire ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Écrire ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Écrire APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Effacer ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Effacer ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Effacer APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "Version ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Recommandé)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "Encodage des caractères ID3v1 (iso8859-1 par défaut)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Écrire ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "Content-Type Mapping"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
"plugin, or \"ffmpeg\" plugin."
msgstr ""
+ "Cette table définit la liaison entre les types de contenu de flux réseau et "
+ "les greffons du décodeur de DeaDBeeF. Par exemple, les fichiers mp3 peuvent "
+ "avoir le type de contenu \"audio/x-mpeg\", et avoir besoin d'être décodé par "
+ "le propre greffon \"stdmpg\" de DeaDBeeF, ou le greffon \"ffmpeg\"."
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "Revenir aux paramètres par défaut"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "Type de Contenu"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "Greffons:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr "Propriétés du bouton"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr "Couleur:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr "Couleur du texte:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr "Icône:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr "Étiquette"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr "Choisir une action"
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Artiste / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "N° piste"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
msgstr "Ajouter à la file d'attente de lecture"
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
msgstr "Enlever de la file d'attente de lecture"
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
msgstr "Recharger les métadonnées"
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
msgstr "Supprimer du disque"
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Ajouter une colonne"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Éditer la colonne"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Enlever la colonne"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
- msgstr ""
+ msgstr "Épingler les groupes lors du défilement"
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Grouper par"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Aucun"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Artiste/Date/Album"
@@@ -1106,19 -1161,21 +1183,21 @@@ msgstr "Configurer %s
msgid "Default Audio Device"
msgstr "Périphérique audio par défaut"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
+ "Vous avez modifié les paramètres des raccourcis, mais vous n'avez pas "
+ "sauvegarder les changements."
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
- msgstr ""
+ msgstr "Êtes-vous sûr de vouloir continuer sans avoir sauvegardé?"
#: ../plugins/gtkui/progress.c:56
msgid "Adding files..."
msgstr "Ajout des fichiers..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Initialisation..."
@@@ -1131,142 -1188,142 +1210,152 @@@ msgid "Really close the window?
msgstr "Fermer réellement la fenêtre ?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Plusieurs valeurs]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Clé"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Clé"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Valeur"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[Plusieurs valeurs]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Edition des tags..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Nom du champ"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Nom:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Les noms de champ ne doivent pas commencer par : ou _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Impossible d'ajouter le champ"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Un champ avec le même nom existe, merci d'utiliser un nom différent."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Ajouter un champ"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Enlever le champ"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "Utilisation: deadbeef [options] [--] [fichier(s)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Options :\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help ou -h Affiche l'aide (ce message) et quitte\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Fermer le lecteur\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Affiche les informations de version et quitte\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Démarre la lecture\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Arrête la lecture\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Suspend la lecture\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr "--toggle-pause Mettre en pause\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
"--play-pause Jouer la piste si elle est arrêtée, mettre en pause sinon\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Musique suivante dans la liste de lecture\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Musique précédente dans la liste de lecture\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Musique aléatoire dans la liste de lecture\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr ""
" --queue Ajoute le(s) fichier(s) dans la liste existante\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
"--gui GREFFON Indique le greffon GUI à utiliser, par défault \"GTK2\"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Envoi le nom de la piste format dans stdout\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1274,11 -1331,11 +1363,11 @@@
" copy[r]ight, [e]lapsed\n"
msgstr ""
" FMT %%-syntaxe : [a]rtiste, [t]itre, al[b]um,\n"
- " [l]ongueur, [n]uméro de piste, [y]année, [c]"
- "ommentaire,\n"
+ " [l]ongueur, [n]uméro de piste, [y]année, "
+ "[c]ommentaire,\n"
" copy[r]ight, [e]coulé\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1287,28 -1344,24 +1376,36 @@@ msgstr "
" ex : --nowplaying \"%%a - %%t\" affiche \"artiste - "
"titre\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- "pour plus d'informations, voir http://sourceforge.net/apps/mediawiki/"
- "deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Défaut"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Oui"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Défaut"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Oui"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Non"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1333,7 -1386,7 +1430,7 @@@ msgstr "
"Artiste du groupe / de l'album\n"
"Personnalisé"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1341,7 -1394,7 +1438,7 @@@ msgstr "
"Gauche\n"
"Droite"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1351,7 -1404,7 +1448,7 @@@ msgstr "
"Piste\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1359,7 -1412,7 +1456,7 @@@ msgstr "
"Ascendant\n"
"Descendant"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1367,14 -1420,7 +1464,7 @@@ msgstr "
"2.3 (Recommandé)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Impossible de trouver le fichier pixmap : %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1387,8 -1433,8 +1477,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "Ajouter un CD audi"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1547,103 -1593,105 +1637,105 @@@ msgstr "
#. OSD Notify plugin
#: ../translation/extra.c:49
msgid "Notification title format"
- msgstr ""
+ msgstr "Format de titre de notification"
#: ../translation/extra.c:50
msgid "Notification content format"
- msgstr ""
+ msgstr "Format de contenu de notification"
#: ../translation/extra.c:51
msgid "Show album art"
- msgstr ""
+ msgstr "Montrer la couverture de l'album"
#: ../translation/extra.c:52
msgid "Album art size (px)"
- msgstr ""
+ msgstr "Taille de la couverture de l'album (px)"
#. PulseAudio output plugin
#: ../translation/extra.c:54
msgid "PulseAudio server"
- msgstr ""
+ msgstr "Serveur PulseAudio"
#: ../translation/extra.c:56
msgid "Samplerate"
- msgstr ""
+ msgstr "Taux d'échantillonnage"
#. SHN player plugin
#: ../translation/extra.c:58
msgid "Relative seek table path"
- msgstr ""
+ msgstr "Chemin de table de recherche relatif"
#: ../translation/extra.c:59
msgid "Absolute seek table path"
- msgstr ""
+ msgstr "Chemin de table de recherche absolu"
#: ../translation/extra.c:60
msgid "Swap audio bytes (toggle if all you hear is static)"
msgstr ""
+ "Permuter les octets audio (basculez si tout ce que vous entendez est "
+ "statique)"
#. SID decoder plugin
#: ../translation/extra.c:62
msgid "Enable HVSC Songlength DB"
- msgstr ""
+ msgstr "Activer HVSC Songlenght DB"
#: ../translation/extra.c:63
msgid "Songlengths.txt (from HVSC)"
- msgstr ""
+ msgstr "Songlengths.txt (de HVSC)"
#: ../translation/extra.c:64
msgid "Bits per sample (8 or 16)"
- msgstr ""
+ msgstr "Bits par échantillon (8 ou 16)"
#: ../translation/extra.c:65
msgid "Default song length (sec)"
- msgstr ""
+ msgstr "Longueur de morceau par défaut (sec)"
#. WildMidi player plugin
#: ../translation/extra.c:67
msgid "Timidity++ bank configuration file"
- msgstr ""
+ msgstr "Banque de fichier de configuration Timidity++ bank"
#: ../translation/extra.c:70
msgid "Track Title"
- msgstr ""
+ msgstr "Titre"
#: ../translation/extra.c:71
msgid "Performer"
- msgstr ""
+ msgstr "Interprète"
#: ../translation/extra.c:76
msgid "Total Tracks"
- msgstr ""
+ msgstr "Pistes totales"
#: ../translation/extra.c:77
msgid "Genre"
- msgstr ""
+ msgstr "Genre"
#: ../translation/extra.c:78
msgid "Composer"
- msgstr ""
+ msgstr "Compositeur"
#: ../translation/extra.c:79
msgid "Disc Number"
- msgstr ""
+ msgstr "Numéro de disque"
#: ../translation/extra.c:80
msgid "Comment"
- msgstr ""
+ msgstr "Commentaires"
#: ../translation/extra.c:81
msgid "Encoder / Vendor"
- msgstr ""
+ msgstr "Encodeur / Vendeur"
#: ../translation/extra.c:83
msgid "Location"
- msgstr ""
+ msgstr "Emplacement"
#: ../translation/extra.c:84
msgid "Subtrack Index"
- msgstr ""
+ msgstr "Index de sous-piste"
#: ../translation/extra.c:85
msgid "Tag Type(s)"
@@@ -1660,315 -1708,336 +1752,336 @@@ msgstr "Codec
#. FFmpeg deocder plugin
#: ../translation/extra.c:89
msgid "File Extensions (separate with ';')"
- msgstr ""
+ msgstr "Extensions de fichier (séparées par ';')"
#. Converter GUI
#: ../translation/extra.c:91
msgid "Convert"
- msgstr ""
+ msgstr "Convertir"
#. Resampler (Secret Rabbit Code)
#: ../translation/extra.c:93
msgid "Target Samplerate"
- msgstr ""
+ msgstr "Taux d'échantillonnage cible"
#: ../translation/extra.c:94
msgid "Quality / Algorithm"
- msgstr ""
+ msgstr "Qualité / Algorithme"
#: ../translation/extra.c:95
msgid "Automatic Samplerate (overrides Target Samplerate)"
msgstr ""
+ "Taux d'échantillonnage automatique (ignorer le taux d'échantillonnage cible)"
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
#: ../translation/extra.c:99
msgid "Disable gapless playback (faster scanning)"
- msgstr ""
+ msgstr "Désactiver la lecture sans blanc (scan plus rapide)"
#. adplug
#: ../translation/extra.c:101
msgid "Prefer Ken emu over Satoh (surround won't work)"
- msgstr ""
+ msgstr "Préférer Ken emu à Satoh (surround ne fonctionnera pas)"
#: ../translation/extra.c:102
msgid "Enable surround"
+ msgstr "Activer surround"
+
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
- msgstr ""
+ msgstr "Le fichier existe déjà . L'écraser?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
- msgstr ""
+ msgstr "Avertissement du convertisseur"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
- msgstr ""
+ msgstr "Veuillez sélectionner un encodeur"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
- msgstr ""
+ msgstr "Erreur du convertisseur"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
- msgstr ""
+ msgstr "Conversion en cours..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
- msgstr ""
+ msgstr "Sélectionner un dossier..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
- msgstr ""
+ msgstr "Échec de sauvegarde du préréglage de l'encodeur"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
+ "Vérifier les permissions du dossier de préréglage, choisissez un nom "
+ "différent, ou libérer de l'espace disque"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
+ "Un préréglage avec le même nom existe déjà . Essayez avec un nom différent."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
- msgstr ""
+ msgstr "Erreur"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
- msgstr ""
+ msgstr "Ajouter un nouvel encodeur"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
- msgstr ""
+ msgstr "Éditer l'encodeur"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
- msgstr ""
+ msgstr "Enlever le préréglage"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
- msgstr ""
+ msgstr "Cette action va supprimer le préréglage sélectionné. Êtes-vous sûr?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
- msgstr ""
+ msgstr "Encodeurs"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
- msgstr ""
+ msgstr "Ajouter le greffon à la chaîne DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
- msgstr ""
+ msgstr "Échec de sauvegarde du préréglage DSP"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
- msgstr ""
+ msgstr "Nouveau préréglage DSP"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
- msgstr ""
+ msgstr "Éditer le préréglage DSP"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
- msgstr ""
+ msgstr "Préréglages DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
- msgstr ""
+ msgstr "Dossier de destination:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
- msgstr ""
+ msgstr "Écrire dans le dossier source de la piste"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
- msgstr ""
+ msgstr "Préserver la structure du dossier"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
- msgstr ""
+ msgstr "Nom de fichier de sortie :"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
"Extension (e.g. .mp3) will be appended automatically.\n"
"Leave the field empty for default (%a - %t)."
msgstr ""
+ "L'extension (ex : .mp3) sera ajoutée automatiquement.\n"
+ "Laissez le champ vide pour le réglage par défaut (%a - %t)"
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
- msgstr ""
+ msgstr "Encodeur :"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
- msgstr ""
+ msgstr "Préréglage DSP :"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
- msgstr ""
+ msgstr "Nombre de fils :"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
- msgstr ""
+ msgstr "Format d'échantillon de sortie :"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
- msgstr ""
+ msgstr "Garder le format source"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
- msgstr ""
+ msgstr "8 bits entiers signés"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
- msgstr ""
+ msgstr "16 bits entiers signés"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
- msgstr ""
+ msgstr "24 bits entiers signés"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
- msgstr ""
+ msgstr "32 bits entiers signés"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
- msgstr ""
+ msgstr "32 bits flottants"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
- msgstr ""
+ msgstr "Lorsque le fichier existe :"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
- msgstr ""
+ msgstr "Demander quoi faire"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
- msgstr ""
+ msgstr "Écraser"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
- msgstr ""
+ msgstr "Éditer le préréglage de l'encodeur"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
- msgstr ""
+ msgstr "Encodeur sans nom"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
- msgstr ""
+ msgstr "Extension de fichier de sortie :"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
- msgstr ""
+ msgstr "Ex: mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
- msgstr ""
+ msgstr "Ligne de commande :"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
"Example: lame - %o\n"
"%i for input file, %o for output file, - for stdin"
msgstr ""
+ "Exemple : lame - %o\n"
+ "%i pour fichier d'entrée, %o pour fichier de sortie, - pour stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
"<small>%o - output file name\n"
"%i - temporary input file name</small>"
msgstr ""
+ "<small>%o - nom de fichier de sortie\n"
+ "%i - nom de fichier d'entrée temporaire</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
- msgstr ""
+ msgstr "Méthode :"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
- msgstr ""
+ msgstr "Tube"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
- msgstr ""
+ msgstr "Fichier temporaire"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
- msgstr ""
+ msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
- msgstr ""
+ msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
- msgstr ""
+ msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
- msgstr ""
+ msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
- msgstr ""
+ msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
- msgstr ""
+ msgstr "<b>Éditeur d'étiquette</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
- msgstr ""
+ msgstr "Éditeur de préréglage DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
- msgstr ""
+ msgstr "Préréglage DSP sans nom"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Ajouter"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Impossible de trouver le fichier pixmap : %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1978,45 -2047,55 +2091,55 @@@
"32 bit signed int\n"
"32 bit float"
msgstr ""
+ "Garder le format source\n"
+ "8 bits entiers signés\n"
+ "16 bits entiers signés\n"
+ "24 bits entiers signés\n"
+ "32 bits entiers signés\n"
+ "32 bits flottants"
#: ../plugins/converter/converter.glade.h:19
msgid ""
"Prompt\n"
"Overwrite"
msgstr ""
+ "Demander quoi faire\n"
+ "Écraser"
#: ../plugins/converter/converter.glade.h:34
msgid ""
"Pipe\n"
"Temporary file"
msgstr ""
+ "Tube\n"
+ "Fichier temporaire"
#: ../plugins/shellexecui/interface.c:46
#: ../plugins/shellexecui/shellexec.glade.h:1
msgid "Custom Shell Commands"
- msgstr ""
+ msgstr "Commandes personnalisées de l'interface"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
- msgstr ""
+ msgstr "Éditer"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
- msgstr ""
+ msgstr "Fermer"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
- msgstr ""
+ msgstr "Éditer la commande"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
- msgstr ""
+ msgstr "Commande :"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2024,176 -2103,186 +2147,190 @@@
"main application was started from. Title formatting can be used. Example: "
"xdg-open %D"
msgstr ""
+ "Commande d'interface arbitraire. Sera exécuté dans le contexte de "
+ "l'interface de l'application principale qui a été démarrée. Le formatage de "
+ "titre peut être utilisé. Exemple: xdg-open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
- msgstr ""
+ msgstr " Identification :"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
- msgstr ""
+ msgstr "Nom à structure libre, par exemple \"Ma commande d'interface\""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
+ "Commande d'identification, devrait être normalement quelque chose de court, "
+ "par exemple \"youtube_open\". Cela doit être unique."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
- msgstr ""
+ msgstr "Pistes seules"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
- msgstr ""
+ msgstr "Fonctionne sur une piste seule."
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
- msgstr ""
+ msgstr "Plusieurs Pistes"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
- msgstr ""
+ msgstr "Fonctionne sur plusieurs pistes."
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
- msgstr ""
+ msgstr "Local"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
- msgstr ""
+ msgstr "Fonctionne sur des fichiers locaux."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
- msgstr ""
+ msgstr "Distant"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
- msgstr ""
+ msgstr "Fonctionne sur des fichiers distants (ex : http:// streams)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
- msgstr ""
+ msgstr "Générique (Menu Principal)"
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
- msgstr ""
+ msgstr "L'objet devrait apparaître dans le menu principal "
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
"contains the menu path like this: \"File/My Command\", where File is the "
"menu name in the English version.</small>"
msgstr ""
+ "<small>Si vous voulez ajouter la commande au menu principal, assurez-vous "
+ "que le titre contienne le chemin de menu comme ceci: \"Fichier/Ma Commande"
+ "\", où le fichier est le nom du menu dans la version anglaise.</small>"
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
- msgstr ""
+ msgstr "Ajouter une commande"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
- msgstr ""
+ msgstr "Supprimer"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
- msgstr ""
+ msgstr "Cette action va supprimer le préréglage sélectionné. Êtes-vous sûr?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
- msgstr ""
+ msgstr "Confirmer la suppression"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
- msgstr ""
+ msgstr "L'identification ne doit pas être vide et unique.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
- msgstr ""
+ msgstr "Le titre ne doit pas être vide\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
- msgstr ""
+ msgstr "La commande de l'interface ne doit pas être vide.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
- msgstr ""
+ msgstr "Valeurs invalides"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
- msgstr ""
+ msgstr "Formats de son supportés"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
- msgstr ""
+ msgstr "Tous les fichiers (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
- msgstr ""
+ msgstr "Ouvrir un (des) fichier(s)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
- msgstr ""
+ msgstr "Ajouter un (des) fichier(s) Ã la liste de lecture..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
- msgstr ""
+ msgstr "Ajouter un (des) dossier(s) Ã la liste de lecture..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
- msgstr ""
+ msgstr "Suivre les liens symboliques"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
- msgstr ""
+ msgstr "aide.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
- msgstr ""
+ msgstr "Supprimer les fichiers du disque"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
+ "Les fichiers seront perdus. Procéder ?\n"
+ "(Ce dialogue peut être désactivé dans les paramètres du greffon GTKUI)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
- msgstr ""
+ msgstr "Charger une liste de lecture"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
- msgstr ""
+ msgstr "Autres fichiers (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
- msgstr ""
+ msgstr "Enregistrer la liste de lecture sous"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
- msgstr ""
+ msgstr "Fichiers de liste de lecture DeaDBeeF (*.dbpl)"
#: ../plugins/gtkui/ctmapping.c:129
msgid "Content-Type"
- msgstr ""
+ msgstr "Type de contenu"
#: ../plugins/gtkui/ctmapping.c:199
msgid "Invalid value(s)."
- msgstr ""
+ msgstr "Valeur(s) invalide(s)."
#: ../plugins/gtkui/ctmapping.c:200
msgid ""
@@@ -2205,107 -2294,125 +2342,201 @@@
"Content type should be only letters, numbers and '-' sign.\n"
"Plugin id can contain only letters and numbers."
msgstr ""
+ "Les champs des greffons et type de contenu ne doivent pas être vide, et "
+ "doivent respecter les règles.\n"
+ "Exemple de type de contenu: 'audio/mpeg'.\n"
+ "Exemple de greffon ids: 'stdmpg ffmpeg'.\n"
+ "Les espaces doivent être utilisés comme des séparateurs dans la liste de "
+ "greffon ids.\n"
+ "Le type de contenu doit seulement être des lettres, des numéros et le signe "
+ "'-'.\n"
+ "Le greffon id peut seulement contenir des lettres et des numéros."
#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
msgid "Nothing is selected."
- msgstr ""
+ msgstr "Rien n'a été sélectionné"
+
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr "Le gadget \"%s\" n'est pas disponible"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
++=======
+ #: ../plugins/gtkui/widgets.c:772
++>>>>>>> upstream/0.6.2
msgid "Replace with..."
- msgstr ""
+ msgstr "Remplacer par..."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:599
++=======
+ #: ../plugins/gtkui/widgets.c:777
++>>>>>>> upstream/0.6.2
msgid "Insert..."
- msgstr ""
+ msgstr "Insérer..."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:626
++=======
+ #: ../plugins/gtkui/widgets.c:804
++>>>>>>> upstream/0.6.2
msgid "Cut"
- msgstr ""
+ msgstr "Couper"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:633
++=======
+ #: ../plugins/gtkui/widgets.c:811
++>>>>>>> upstream/0.6.2
msgid "Copy"
- msgstr ""
+ msgstr "Copier"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:640
++=======
+ #: ../plugins/gtkui/widgets.c:818
++>>>>>>> upstream/0.6.2
msgid "Paste"
- msgstr ""
+ msgstr "Coller"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:764
++=======
+ #: ../plugins/gtkui/widgets.c:942
++>>>>>>> upstream/0.6.2
msgid "Multiple widgets of this type are not supported"
- msgstr ""
+ msgstr "Plusieurs gadgets de ce type ne sont pas pris en charge"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1071
++=======
+ #: ../plugins/gtkui/widgets.c:1249
++>>>>>>> upstream/0.6.2
msgid "Lock movement"
- msgstr ""
+ msgstr "Verrouiller tout déplacement"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1356
++=======
+ #: ../plugins/gtkui/widgets.c:1534
++>>>>>>> upstream/0.6.2
msgid "Move tab left"
- msgstr ""
+ msgstr "Déplacer l'onglet vers la gauche"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1363
++=======
+ #: ../plugins/gtkui/widgets.c:1541
++>>>>>>> upstream/0.6.2
msgid "Move tab right"
- msgstr ""
+ msgstr "Déplacer l'onglet vers la droite"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1370
++=======
+ #: ../plugins/gtkui/widgets.c:1548
++>>>>>>> upstream/0.6.2
msgid "Remove tab"
- msgstr ""
+ msgstr "Enlever l'onglet"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1377
++=======
+ #: ../plugins/gtkui/widgets.c:1555
++>>>>>>> upstream/0.6.2
msgid "Rename tab"
- msgstr ""
+ msgstr "Renommer l'onglet"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1438
++=======
+ #: ../plugins/gtkui/widgets.c:1616
++>>>>>>> upstream/0.6.2
msgid "Add new tab"
- msgstr ""
+ msgstr "Ajouter un nouvel onglet"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1861
++=======
+ #: ../plugins/gtkui/widgets.c:2036
++>>>>>>> upstream/0.6.2
msgid "Show Column Headers"
- msgstr ""
+ msgstr "Montrer les en-têtes de colonne"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:2969
++=======
+ #: ../plugins/gtkui/widgets.c:3147
++>>>>>>> upstream/0.6.2
msgid "Expand the box by 1 item"
- msgstr ""
+ msgstr "Développer la boîte par 1 objet"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:2974
++=======
+ #: ../plugins/gtkui/widgets.c:3152
++>>>>>>> upstream/0.6.2
msgid "Shrink the box by 1 item"
- msgstr ""
+ msgstr "Réduire la boîte par 1 objet"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:2979
++=======
+ #: ../plugins/gtkui/widgets.c:3157
++>>>>>>> upstream/0.6.2
msgid "Homogeneous"
- msgstr ""
+ msgstr "Homogène"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3019
++=======
+ #: ../plugins/gtkui/widgets.c:3197
++>>>>>>> upstream/0.6.2
msgid "Expand"
- msgstr ""
+ msgstr "Développer"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3027
++=======
+ #: ../plugins/gtkui/widgets.c:3205
++>>>>>>> upstream/0.6.2
msgid "Fill"
- msgstr ""
+ msgstr "Remplir"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
- msgstr ""
+ msgstr "Configurer le bouton"
+
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr "Voix :"
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
- msgstr ""
+ msgstr "Éditer la liste de lecture"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
- msgstr ""
+ msgstr "Renommer la liste de lecture"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
- msgstr ""
+ msgstr "Enlever la liste de lecture"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
- msgstr ""
+ msgstr "Ajouter une nouvelle liste de lecture"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
- msgstr ""
+ msgstr "Nom"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
- msgstr ""
+ msgstr "Navigateur de liste de lecture"
diff --combined po/gl.po
index daf5941,4984cfd..bfcd767
--- a/po/gl.po
+++ b/po/gl.po
@@@ -3,15 -3,15 +3,26 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
++<<<<<<< HEAD
+# antiparvos <marcoslansgarza at gmail.com>, 2013
+# mbouzada <mbouzada at gmail.com>, 2010
+# mbouzada <mbouzada at gmail.com>, 2010
++=======
+ # antiparvos <marcoslansgarza at gmail.com>, 2013-2014
+ # Miguel Anxo Bouzada <mbouzada at gmail.com>, 2010
+ # Miguel Anxo Bouzada <mbouzada at gmail.com>, 2010,2014
++>>>>>>> upstream/0.6.2
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-24 17:55+0000\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:16+0000\n"
++>>>>>>> upstream/0.6.2
"Last-Translator: antiparvos <marcoslansgarza at gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/deadbeef-player/"
"language/gl/)\n"
@@@ -21,17 -21,17 +32,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Sobre DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "Cambios en DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Tradutores de DeaDBeeF"
@@@ -88,1009 -88,1066 +99,1088 @@@ msgstr "Restabelecer o preamplificador
msgid "Zero Bands"
msgstr "Restabelecer as bandas"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Axustes"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 dÃa %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dÃas %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Detido | %d pistas | Tempo total: %s"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Estéreo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Pausado | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pistas | Tempo total: %s"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Nova lista de reprodución"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Nova lista de reprodución (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Listas con lapelas"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Lista de reprodución"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "Separador (arriba e abaixo)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "Separador (esquerda e dereita)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Lapelas das listas"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Propiedades da selección"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Mostrar portadas"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "Scope"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "Spectrum"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Botón"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr "Barra de busca"
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr "Controis de reprodución"
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr "Barra de volume"
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr "Voces Chiptune"
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Produciuse un fallo ao ler o ficheiro de axuda"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Produciuse un fallo ao cargar o ficheiro de axuda"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
"O reprodutor está executando tarefas en segundo plano. Se sae agora, as "
"tarefas cancelaranse ou interrumpiranse e é posÃbel que se perdan datos."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "AÃnda desexa saÃr?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Aviso"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Ficheiro"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Abrir ficheiro(s)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Engadir ficheiro(s)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Engadir cartafol(es)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Engadir localización"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nova lista de reprodución"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Cargar a lista de reprodución"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Gardar a lista de reprodución"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_SaÃr"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Editar"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Limpar"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Seleccionar todo"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Desmarcar todo"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Inverter a selección"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Selección"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Retirar"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Cortar"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Buscar"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Ordenar por"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "TÃtulo"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Número de pista"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Ãlbum"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Interprete"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Data"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Ao chou"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Personalizado"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Preferencias"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Ver"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Barra de estado"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ecualizador"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "Modo deseño"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Reproducir"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Orden"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Lineal"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Barallar pistas"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Barallar álbums"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Repetir"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Repetir todas"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Repetir canción"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Non repetir"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Desprazar á seguinte reprodución"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Punteiro na seguinte reprodución"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Deter ao rematar a pista actual"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr "Parar despois da pista actual"
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr "Deter ao rematar o álbum actual"
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Ir á pista actual"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Axuda"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Cambios"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Sobre"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Tradutores"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Buscar"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Deter"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Reproducir"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pausa"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Anterior"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Seguinte"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Reproducir ao chou"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Sobre"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "SaÃr"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Axuda"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Propiedades da pista"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "Localización:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Configuración"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Aplicar"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Pechar"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadatos"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Propiedades"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "TÃtulo:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Escriba aquà o novo tÃtulo da columna"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Tipo:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Ãndice de elementos"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Reproducindo"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Portada"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Interprete - Ãlbum"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Duración"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Pista numero"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Banda / Interprete do álbum"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Formato:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Aliñamento"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Esquerda"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Dereita"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Cancelar"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_Aceptar"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Engadido de saÃda:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Dispositivo de saÃda:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Converter sempre o son de 8 bits a 16 bits"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr "Converter sempre o son de 16 bits a 24 bits"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Son"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Modo de normalización de volume"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Desactivar"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Pista"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Escala de lÃmite de normalización de volume"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Normalización de volume do preamplificador:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Preamplificación global:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Engadir ficheiros desde a liña de ordes (ou xestor de ficheiros) a esta "
"lista de reprodución:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Continuar a sesión anterior no inicio"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Non engadir desde ficheiros cando se engaden cartafoles"
++<<<<<<< HEAD
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
+msgid "Auto-reset \"Stop after current\""
+msgstr "Restaurar automaticamente «Deter ao rematar a pista actual»"
++=======
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+ "A opción «Parar despois da pista actual» desactivarase despois da acción"
++>>>>>>> upstream/0.6.2
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+ "A opción «Parar despois do álbum actual» desactivarase despois da acción"
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Reprodución"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Configurar"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Cadeas DSP predefinidas"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Cargar"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Pechar minimizado na área de notificación"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Agochar a icona da área de notificación"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr "Activar detección e recodificacón do SHIFT-JIS xaponés"
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "Activar a detección e recodificación do Ruso CP1251"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Activar a detección e recodificación do Chinés CP936"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Frecuencia de actualización da interface (veces por segundo):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Texto da barra de tÃtulo cando se reproduce:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Texto da barra de tÃtulo cando está detido:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "Engadido de interface de usuario (require reiniciar):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr "Reprodutor"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr "Pechar as listas de reprodución co botón central do rato"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr "Resaltar a pista en reprodución usando tipografÃa grosa."
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Agochar o elemento «Eliminar do disco» do menú contextual "
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr "Agochar o elemento «Eliminar do disco» do menú contextual"
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
"Nomear automaticamente as listas de reprodución ao engadir un só cartafol"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr "Adaptar as columnas para que se axusten a xanela"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "GUI/Misc"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Anular"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Fronte"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Fondo"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Cores das barras de busca/volume"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Medio"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Claro"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Escuro"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Base"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Texto"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Cores das lapelas"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "Cambiar (ignora o tema GTK, mais acelera o debuxado)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Fila par"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Fila impar"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Fila seleccionada"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Texto seleccionado"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Cursor"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Cores da lista de reprodución"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Cores"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Activar o servidor proxy"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Enderezo do servidor proxy:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Porto do servidor proxy:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Tipo de proxy:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Nome de usuario do proxy:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Contrasinal do proxy:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "Axente do usuario HTTP:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "Editar a asignación do tipo de contido"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Rede"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr "Teclas rápidas asignadas:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr "Acción:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<Sen estabelecer>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr "Combinación de teclas:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Tecla rápida global"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
"The changes will NOT be saved\n"
"if you don't press Apply."
msgstr ""
+ "Use o botón «Aplicar» para gardar os cambios\n"
+ "ou o botón «Reverter» para desfacelos.\n"
+ "Os cambios NON se gardarán se non\n"
+ "preme «Aplicar»."
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr "_Predeterminados"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "Teclas rápidas"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Versión: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Dereitos de autor"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Engadidos"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr "Estabelecer tÃtulo personalizado"
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "Agrupar por..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "Ordenar por..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Formato"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Ascendente"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Descendente"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Escolla o engadido DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Engadido"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Configuración do editor de etiquetas"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Escribir ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Escribir ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Escribir APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Eliminar ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Eliminar ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Eliminar APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "Versión de ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (recomendado)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "Codificación de caracteres de ID3v1 (por omisión é iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Escribir ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "Asignación do tipo de contido"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
"plugin, or \"ffmpeg\" plugin."
msgstr ""
+ "Esta táboa define as asignacións entre os tipos de contido de fluxos de rede "
+ "e os engadidos decodificadores de DeaDBeeF. Por exemplo, os ficheiros mp3 "
+ "poden ter un tipo de contido «audio/x-mpeg» e precisan decodificarse polos "
+ "engadidos propios de DeaDBeeF stdmpg ou ffmpeg."
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "Restabelecer predeterminados"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "Tipo de contido:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "Engadidos:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr "Propiedades do boton"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr "Cor:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr "Cor do texto:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr "Icona:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr "Etiqueta:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr "Seleccionar acción"
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+ "Este diálogo permite personalizar o tÃtulo de calquera pista. Moi útil para "
+ "emisoras de radio. Tamén hai unha opción para personalizar os tÃtulos no "
+ "diálogo «Engadir localización». O tÃtulo verase nas columnas que mostran o "
+ "campo dos metadatos do «Artista». Aparecerá como [personalización] artista "
+ "se se mostra o campo Artista ou só «personalización» en caso contrario."
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Interprete / Ãlbum"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Pista num."
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Engadir na cola de reprodución"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr "Engadir á cola de reprodución"
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Retirar da cola de reprodución"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr "Eliminar da cola de reprodución"
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
msgstr "Recargar os metadatos"
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Retirar do disco"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr "Eliminar do disco"
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Engadir columna"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Editar columna"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Retirar columna"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr "Fixar os grupos ao desprazarse"
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Agrupar por"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Ningún"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Interprete/Data/Ãlbum"
@@@ -1107,11 -1164,11 +1197,11 @@@ msgstr "Configurar %s
msgid "Default Audio Device"
msgstr "Dispositivo de son predeterminado"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr "Modificou os axustes das teclas rápidas pero non gardou os cambios."
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr "Desexa continuar sen gardar?"
@@@ -1119,7 -1176,7 +1209,7 @@@
msgid "Adding files..."
msgstr "Engadindo ficheiros,,,"
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Iniciando..."
@@@ -1132,104 -1189,104 +1222,114 @@@ msgid "Really close the window?
msgstr "Ten certeza de que quere pechas esta xanela?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Valores múltiples] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Tecla"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Tecla"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Valor"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[Varios valores]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Escribindo etiquetas"
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Nome do campo"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Nome:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Os nomes dos campos non deben comezar con «:» ou «_»"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Non é posÃbel engadir o campo"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Xa existe un campo con este nome, tente con outro diferente."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Engadir campo"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Retirar campo"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
"Uso: deadbeef [opcións] [--] [ficheiro(s)]\n"
"\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Opcións:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help ou -h Amosar a axuda (esta mensaxe) e saÃr\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Pechar o reprodutor\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Amosar a versión e saÃr\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Iniciar a reprodución\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Deter a reprodución\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pausar a reprodución\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Inverter a pausa\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1237,28 -1294,28 +1337,28 @@@ msgstr "
" --play-pause Iniciar a reprodución se se detén, ou pola contra "
"inverter a pausa\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Seguinte canción da lista de reprodución\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Canción anterior da lista de reprodución\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Canción ao chou da lista de reprodución\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr ""
" --queue Engadir ficheiro(s) á lista de reprodución existente\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
@@@ -1267,12 -1324,12 +1367,12 @@@ msgstr "
"predeterminado é «GTK2»\n"
"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Amosar o nome da pista formatado por stdout\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1283,7 -1340,7 +1383,7 @@@ msgstr "
" l: Duración, n: Pista, y: Ano, c: Comentario,\n"
" r: Copyright, e: Tempo restante\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1292,28 -1349,24 +1392,36 @@@ msgstr "
" e.g.: --nowplaying «%%a - %%t» amosarÃa: «interprete - "
"tÃtulo»\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
- msgstr ""
- " para obter máis información, vexa http://sourceforge."
- "net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
+ msgstr "para obter máis información, vexa %s\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Predeterminado"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Si"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Predeterminado"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Si"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Non"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1339,7 -1392,7 +1447,7 @@@ msgstr "
"Banda / Intreprete do álbum\n"
"Personalizado"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1347,7 -1400,7 +1455,7 @@@ msgstr "
"Esquerda\n"
"Dereita"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1357,7 -1410,7 +1465,7 @@@ msgstr "
"Pista\n"
"Ãlbum"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1365,7 -1418,7 +1473,7 @@@ msgstr "
"Ascendente\n"
"Descendente"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1373,14 -1426,7 +1481,7 @@@ msgstr "
"2.3 (recomendado)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Non se atopou o ficheiro de imaxe: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1393,7 -1439,7 +1494,11 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
++<<<<<<< HEAD
+msgid "Add audio CD"
++=======
+ msgid "Add Audio CD"
++>>>>>>> upstream/0.6.2
msgstr "Engadir CD de son"
#: ../translation/extra.c:4
@@@ -1687,7 -1733,7 +1792,11 @@@ msgstr "Mostraxe automática (sobrescri
#. shellexecui
#: ../translation/extra.c:97
++<<<<<<< HEAD
+msgid "Configure custom shell commands"
++=======
+ msgid "Configure Custom Shell Commands"
++>>>>>>> upstream/0.6.2
msgstr "Configurar ordes por terminal personalizadas"
#. mpgmad
@@@ -1703,36 -1749,41 +1812,44 @@@ msgstr "Preferir Ken emu a Satoh (o so
#: ../translation/extra.c:102
msgid "Enable surround"
msgstr "Activar son envolvente"
++<<<<<<< HEAD
++=======
+
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr "[Integrado] %s"
++>>>>>>> upstream/0.6.2
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Este ficheiro xa existe. Quere sobrescribilo?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Aviso do convertedor"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Escolla o codificador"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Produciuse un erro no convertedor"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Convertendo"
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Seleccionar cartafol"
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Produciuse un fallo ao gardar os axustes do codificador"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1740,77 -1791,77 +1857,77 @@@ msgstr "
"Comprobe os permisos predeterminados do cartafol, tente escoller outro "
"tÃtulo, ou liberar algo de espazo no disco"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "Xa existe un axuste con este tÃtulo. Tente escoller outro tÃtulo."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Erro"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Engadir un novo codificador"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Editar o codificador"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Retirar o axuste"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Esta acción elimina o axuste seleccionado. Está vostede seguro?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Codificadores"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Engadir un «engadido» á cadea DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Non foi posÃbel gardar o axuste DSP"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Novo axuste DSP"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Editar o axuste DSP"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "Axustes DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Cartafol de saÃda:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "Escribir no cartafol da pista de orixe"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "Conservar a estrutura do cartafol"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Nome do ficheiro de saÃda:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1820,89 -1871,89 +1937,89 @@@ msgstr "
"A extensión (p.ex. mp3) engadirase automaticamente.\n"
"Deixar o campo baleiro de xeito predeterminado (%a -%t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Codificador"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "Axuste DSP"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Número de fÃos:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Formato da mostra de saÃda"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Manter o formato da orixe"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 bit asinados int"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 bit asinados int"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 bit asinados int"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 bit asinados int"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 bit flotantes"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Cando o ficheiro xa existe:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Preguntar"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Sobrescribir"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Editar os axustes do codificador"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Codificador sen tÃtulo"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Extensión do ficheiro de saÃda:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "P.ex. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Liña de ordes:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1913,7 -1964,7 +2030,7 @@@ msgstr "
"%i para o ficheiro de entrada, %o para o ficheiro de saÃda, - para a entrada "
"estándar"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1923,66 -1974,72 +2040,72 @@@ msgstr "
"<small>%o - nome do ficheiro de saÃda\n"
"%i - nome do ficheiro temporal de entrada</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Método:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Canalización"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Ficheiro temporal"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Escritor de etiquetas</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "Editor de axustes DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Axuste DSP sen tÃtulo"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Engadir"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Non se atopou o ficheiro de imaxe: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2020,27 -2077,27 +2143,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "Ordes por terminal personalizadas"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "Editar"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "Pechar"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "Editar orde"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "Orde:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2052,17 -2109,17 +2175,17 @@@ msgstr "
"iniciou o aplicativo principal. Pode usarse o formatado do tÃtulo. Exemplo: "
"xdg-open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "ID:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "Nome en forma libre, por exemplo «A miña orde por terminal»"
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
@@@ -2071,57 -2128,57 +2194,57 @@@ msgstr "
"ID da orde, normalmente debe ser curto, por exempolo «abrir_youtube». Debe "
"ser único."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "Pistas únicas"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "Funciona cunha pista única."
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "Múltiples pistas"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "Funciona con múltiples pistas."
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "Local"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "Funciona con ficheiros locais."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "Remoto"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "Funciona con ficheiros remotos (p.e. http:// streams)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr "Xenérico (menú principal)"
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "O elemento deberÃa aparecer no menú principal"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2132,73 -2189,73 +2255,77 @@@ msgstr "
"contén o camiño ao menú deste xeito: \"Ficheiro/A_miña_orde\", onde "
"«Ficheiro» é o nome do menú na versión en inglés.</small>"
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "Engadir orde"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "Eliminar"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
"Esta acción elimina a orde de terminal seleccionada. Está vostede seguro?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "Confirmar a eliminación"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "O ID non pode quedar baleiro e debe ser único.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "O tÃtulo non pode quedar baleiro.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "A orde por terminal non pode quedar baleira.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "Valores incorrectos"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "Formatos compatÃbeis de son"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "Todos os ficheiros (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "Abrir ficheiro(s)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "Engadir ficheiro(s) á lista..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "Engadir cartafol(es) á lista..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "Seguir ligazóns simbólicas"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr "axuda.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "Eliminar os ficheiros do disco"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2206,19 -2263,19 +2333,19 @@@ msgstr "
"Perderanse os ficheiros. Continuar?\n"
"(Este diálogo pode desactivarse nos axustes do engadido GTKUI)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "Cargar lista de reprodución"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "Outros ficheiros (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "Gardar a lista como"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "Ficheiros de listas de reprodución e DeaDBeeF (*.dbpl)"
@@@ -2240,107 -2297,123 +2367,201 @@@ msgid "
"Content type should be only letters, numbers and '-' sign.\n"
"Plugin id can contain only letters and numbers."
msgstr ""
+ "Os campos do tipo de contido e dos engadidos non poden quedar baleiros e "
+ "deben cumprir as regras.\n"
+ "Exemplo de tipo de contido: «audio/mpeg».\n"
+ "Exemplo de tipo de contido: «stdmpg ffmpeg».\n"
+ "Os espazos deben usarse como separadores na lista de ID dos engadidos.\n"
+ "O tipo de contido só debe levar letras, números e o signo «-».\n"
+ "O ID do engadido só debe levar letras e números."
#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
msgid "Nothing is selected."
msgstr "Non se seleccionou nada."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr "SubstituÃr con..."
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr "Inserir..."
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr "Cortar"
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr "Copiar"
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr "Pegar"
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr "Múltiples miniaplicativos deste tipo non son compatÃbeis"
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr "Movemento de bloqueo"
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr "Mover lapela á esquerda"
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr "Mover lapela á dereita"
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr "Eliminar lapela"
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr "Renomear lapela"
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr "Engadir nova lapela"
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr "Amosar as cabeceiras das columnas"
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr "Expandir a caixa 1 elemento"
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr "Encoller a caixa 1 elemento"
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr "Homoxéneo"
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr "Expandir"
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr "Encher"
+
+#: ../plugins/gtkui/widgets.c:3428
+msgid "Configure button"
+msgstr "Configurar botón"
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr "O miniaplicativo «%s» non está dispoñÃbel"
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr "SubstituÃr con..."
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr "Inserir..."
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr "Cortar"
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr "Copiar"
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr "Pegar"
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr "Múltiples miniaplicativos deste tipo non son compatÃbeis"
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr "Movemento de bloqueo"
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr "Mover lapela á esquerda"
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr "Mover lapela á dereita"
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr "Eliminar lapela"
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr "Renomear lapela"
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr "Engadir nova lapela"
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr "Amosar as cabeceiras das columnas"
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr "Expandir a caixa 1 elemento"
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr "Encoller a caixa 1 elemento"
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr "Homoxéneo"
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr "Expandir"
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr "Encher"
+
+ #: ../plugins/gtkui/widgets.c:3606
+ msgid "Configure button"
+ msgstr "Configurar botón"
+
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr "Voces:"
++>>>>>>> upstream/0.6.2
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr "Editar a lista"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr "Renomear a lista"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr "Eliminar a lista"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr "Engadir un lista de reprodución"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr "Nome"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr "Explorador de listas de reprodución"
diff --combined po/he.po
index c27a23d,c2537ef..afb24de
--- a/po/he.po
+++ b/po/he.po
@@@ -3,15 -3,15 +3,21 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
- # Yaron Shahrabani <sh.yaron at gmail.com>, 2010,2013
+ # Yaron Shahrabani <sh.yaron at gmail.com>, 2010,2013-2014
# Yaron Shahrabani <sh.yaron at gmail.com>, 2010
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-08-02 09:39+0000\n"
+ "Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Hebrew (http://www.transifex.com/projects/p/deadbeef-player/"
"language/he/)\n"
"Language: he\n"
@@@ -20,17 -20,17 +26,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "על ×ודות DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "יומן ×”×©×™× ×•×™×™× ×©×œ DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "מתרגמי DeaDBeeF"
@@@ -87,44 -87,44 +93,52 @@@ msgstr "×יפוס מגבר קד×
msgid "Zero Bands"
msgstr "×יפוס הערוצי×"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "תצורות"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "×™×•× ×חד %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d ×™×ž×™× %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "× ×¢×¦×¨ | %d רצועות | %s סך כל זמן ×”× ×’×™× ×”"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "×ž×•× ×•"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "×ž×•× ×•"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "סטרי×ו"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d קסל״ש "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "מושהה |"
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -132,745 -132,772 +146,776 @@@ msgstr "
"%s%s %s| %d הרץ | %d סיביות | %s | %d:%02d / %s | %d רצועות | %s סך כל זמן "
"×”× ×’×™× ×”"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "רשימת השמעה חדשה"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "רשימת השמעה חדשה (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "רשימת השמעה ×¢× ×œ×©×•× ×™×•×ª"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "רשימת השמעה"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "חוצץ (למעלה ולמטה)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "חוצץ (שמ×לה ×•×™×ž×™× ×”)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "×œ×©×•× ×™×•×ª רשימות השמעה"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "מ××¤×™×™× ×™ הבחירה"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "הצגת עטיפת ×לבו×"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "טווח"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "ספקטרו×"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "לחצן"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr "פקדי × ×’×™× ×”"
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr "פס עצמת השמע"
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "×ירע כשל במהלך קרי×ת קובץ העזרה"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "×ירע כשל ×‘×˜×¢×™× ×ª קובץ העזרה"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "×”×× ×כן ×‘×¨×¦×•× ×š לצ×ת?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "×זהרה"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_קובץ"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_פתיחת קובץ/×™×"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "הוספת קובץ/×™×"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "הוספת תיקייה/ות"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "הוספת מיקו×"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "רשימת השמעה חדשה"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "×˜×¢×™× ×ª רשימת השמעה"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "שמירת רשימת השמעה"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "×™_צי××”"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "ע_ריכה"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_מחיקה"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "בחירת הכל"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "ביטול בחירת הכול"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "הפיכת הבחירה"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "בחירה"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "הסרה"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "חיתוך"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_חיפוש"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "סידור לפי"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "כותרת"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "מספר הרצועה"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "×לבו×"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "×ומן"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "ת×ריך"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "×קר××™"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "מות×× ×ישית"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "העדפות"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_תצוגה"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "שורת מצב"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "×קוולייזר"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "מצב עיצוב"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "ה_שמעה"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "סדר"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "קווי"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "ערבול בין הרצועות"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "ערבול בין ×”×לבומי×"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "× ×’×™× ×” בלול××”"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "לול××” על הכול"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "לול××” על שיר ×חד"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "×œ×œ× ×œ×•×œ××”"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "הגלילה עוקבת ×חר ההשמעה"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "הסמן עוקב ×חר ההשמעה"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "עצירה ל×חר ×”× ×•×›×—×™"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "מעבר לרצועה ×”× ×•×›×—×™×ª"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "ע_זרה"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "יומן _×©×™× ×•×™×™×"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "על _×ודות"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "מ_תרגמי×"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "חיפוש"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "עצירה"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "× ×’×™× ×”"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "השהיה"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "הקוד×"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "הב×"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "× ×’×™× ×” ×קר×ית"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "על ×ודות"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "יצי××”"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "עזרה"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "מ××¤×™×™× ×™ הרצועה"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "מיקו×:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "הגדרות"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "ה_חלה"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_סגירה"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "× ×ª×•× ×™ על"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "מ××¤×™×™× ×™×"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "כותרת:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "יש להזין ×ת הכותרת החדשה ×›×ן"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "סוג:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "××™× ×“×§×¡ הפריט"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "×ž×ª× ×’×Ÿ"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "עטיפת ×”×לבו×"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "×ומן – ×לבו×"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "משך"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "רצועה מספר"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "להקה / ×ומן ×”×לבו×"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "×ž×‘× ×”:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "יישור:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "שמ×ל"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "ימין"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_ביטול"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_×ישור"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "תוסף פלט:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "התקן הפלט:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "תמיד להמיר שמע של 8 סיביות ל־16 סיביות"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "שמע"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "מצב הגברת × ×’×™× ×” חוזרת:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "×œ× ×¤×¢×™×œ"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "רצועה"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "מידת הגברת ×”× ×’×™× ×” החוזרת"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "הגברת × ×’×™× ×” חוזרת:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "הגברת × ×’×™× ×” כללית:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr "הוספת ×§×‘×¦×™× ×ž×©×•×¨×ª הפקודה (×ו ×ž×ž× ×”×œ הקבצי×) לרשימת ההשמעה:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "המשך ההפעלה הקודמת ×¢× ×”×ª×—×œ×ª ×”×ª×›× ×™×ª"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "×ין להוסיף מ××¨×›×™×•× ×™× ×‘×¢×ª הוספת תיקיות"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "השמעה"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "הגדרה"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "תצורת שרשרת DSP"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_×˜×¢×™× ×”"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "סגירה ממזערת ל×זור המערכת"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "הסתרת הסמל ב×זור הדיווחי×"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "הפעלה של זיהוי וקידוד מחדש של רוסית בתקן CP1251"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "הפעלה של זיהוי וקידוד מחדש של ×¡×™× ×™×ª בתקן CP936"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "קצב ×¨×¢× ×•×Ÿ ×”×ž× ×©×§ (×¤×¢×ž×™× ×‘×©× ×™×™×”):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "טקסט הכותרת בעת ההשמעה:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "טקסט הכותרת בעת עצירה:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "תוסף ×ž× ×©×§ משתמש (×©×™× ×•×™×™× ×“×•×¨×©×™× ×”×¤×¢×œ×” מחדש):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "הסתרת פריט ההקשר \"מחיקה ×ž×”×›×•× ×Ÿ\""
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "מתן ×©× ×וטומטית לרשימות השמעה בעת הוספת תיקייה בודדת"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
- msgstr ""
+ msgstr "×ž× ×©×§/×©×•× ×•×ª"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "דריסה"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "קידמה"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "רקע"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "צבעי פס גלילת ההשמעה/פס עוצמת השמע"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "×‘×™× ×•× ×™"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "בהיר"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "×›×”×”"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "בסיסי"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "טקסט"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "צבעי ר×שי ×”×œ×©×•× ×™×•×ª"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "דריסה (רכיבי העיצוב של ×”Ö¾GTK ×™×בדו ×ך העיבוד ×™×”×™×” מהיר יותר)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "שורה זוגית"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "שורה ×י־זוגית"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "שורה × ×‘×—×¨×ª"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "טקסט ×©× ×‘×—×¨"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "סמן"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "צבעי רשימת ההשמעה"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "צבעי×"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "הפעלת שרת מתווך"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "כתובת שרת התיווך:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "פתחת שרת התיווך:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "סוג שרת התיווך:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "×©× ×”×ž×©×ª×ž×© במתווך:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "הססמה במתווך:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "סוכן משתמש HTTP:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "רשת"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
- msgstr ""
+ msgstr "מקשי קיצור מוקצי×:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
- msgstr ""
+ msgstr "פעולה:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
- msgstr ""
+ msgstr "צירוף מקשי×:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -878,122 -905,128 +923,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
- msgstr ""
+ msgstr "_בררות מחדל"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
- msgstr ""
+ msgstr "מקשי קיצור"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "גרסה:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "זכויות יוצרי×"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "תוספי×"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "כתובת:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "קיבוץ לפי …"
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "סידור לפי …"
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "×ž×‘× ×”"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "סדר עולה"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "סדר יורד"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "בחירת תוסף DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "תוסף"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "הגדרות כותב התגיות"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "כתיבת ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "כתיבת ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "כתיבת APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "הסרת ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "הסרת ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "הסרת APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "גרסת ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (מומלץ)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "קידוד ×”×ª×•×•×™× ×©×œ ID3v1 (בררת המחדל ×”×™× iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "כתיבת ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1001,91 -1034,100 +1052,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "תוספי×:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
- msgstr ""
+ msgstr "צבע:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
- msgstr ""
+ msgstr "צבע הטקסט:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
- msgstr ""
+ msgstr "סמל:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
- msgstr ""
+ msgstr "תווית:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
+ msgstr "בחירת פעולה"
+
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "×ומן / ×לבו×"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "רצועה מספר"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "הוספה לתור ההשמעה"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "הסרה מתור ההשמעה"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "×˜×¢×™× ×ª × ×ª×•× ×™ העל מחדש"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "הסרה ×ž×”×›×•× ×Ÿ"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "הוספת עמודה"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "עריכת עמודה"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "הסרת עמודה"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "קיבוץ לפי"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "לל×"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "×ומן/ת×ריך/×לבו×"
@@@ -1102,11 -1144,11 +1166,11 @@@ msgstr "הגדרת %s
msgid "Default Audio Device"
msgstr "התקן השמע כברירת מחדל"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1114,7 -1156,7 +1178,7 @@@
msgid "Adding files..."
msgstr "מתבצעת הוספת קבצי×..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "בהפעלה..."
@@@ -1127,141 -1169,141 +1191,151 @@@ msgid "Really close the window?
msgstr "×”×× ×‘×מת לסגור ×ת החלון?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[×¢×¨×›×™× ×ž×¨×•×‘×™×]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "מפתח"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "מפתח"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "ערך"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[ריבוי ערכי×]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "התגיות × ×›×ª×‘×•×ª..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "×©× ×”×©×“×”"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "ש×:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "שמות השדות ×œ× ×™×›×•×œ×™× ×œ×”×ª×—×™×œ ×‘×ª×•×•×™× : ×ו _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "×œ× × ×™×ª×Ÿ להוסיף שדה"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "שדה ×‘×©× ×–×” כבר קיי×, × × ×œ× ×¡×•×ª ×©× ×חר."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "הוספת שדה"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "הסרת שדה"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "Usage: deadbeef [options] [--] [file(s)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Options:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help or -h Print help (this message) and exit\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Quit player\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Print version info and exit\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Start playback\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Stop playback\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pause playback\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Toggle pause\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Next song in playlist\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Previous song in playlist\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Random song in playlist\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Append file(s) to existing playlist\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Print formatted track name to stdout\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1272,7 -1314,7 +1346,7 @@@ msgstr "
" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
" copy[r]ight, [e]lapsed\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1281,28 -1323,24 +1355,36 @@@ msgstr "
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
"- title\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "בררת מחדל"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "כן"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "בררת מחדל"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "כן"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "ל×"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1328,7 -1366,7 +1410,7 @@@ msgstr "
"להקה / ×מן ×”×לבו×\n"
"מות×× ×ישית"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1336,7 -1374,7 +1418,7 @@@ msgstr "
"שמ×ל\n"
"ימין"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1346,7 -1384,7 +1428,7 @@@ msgstr "
"רצועה\n"
"×לבו×"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1354,7 -1392,7 +1436,7 @@@ msgstr "
"סדר עולה\n"
"סדר יורד"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1362,14 -1400,7 +1444,7 @@@ msgstr "
"2.3 (מומלץ)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "×œ× × ×™×ª×Ÿ ×œ×ž×¦×•× ×ת קובץ ×”Ö¾pixmap:†%s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1381,8 -1412,8 +1456,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "הוספת תקליטור שמע"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1674,7 -1705,7 +1749,7 @@@ msgstr "קצב דגימה ×וטומט×
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1691,35 -1722,40 +1766,40 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "הקובץ כבר קיי×. ×”×× ×œ×©×›×ª×‘?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "×זהרה מהממיר"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "× × ×œ×‘×—×•×¨ מצפין"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "שגי×ת ממיר"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "בהמרה..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "בחירת תיקייה..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "×ירע כשל בשמירת ערכת ×”×”×¦×¤× ×”"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1727,77 -1763,77 +1807,77 @@@ msgstr "
"× × ×œ×‘×“×•×§ ×ת הרש×ות תיקיית התצורות, יש ×œ× ×¡×•×ª לבחור בכותרת ×חרת ×ו ×œ×¤× ×•×ª קצת "
"×ž×§×•× ×‘×›×•× ×Ÿ"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "תצורה ב×ותו ×”×©× ×›×‘×¨ קיימת. × × ×œ× ×¡×•×ª לבחור ×‘×©× ×חר."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "שגי××”"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "הוספת מצפין חדש"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "עריכת מצפין"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "הסרת תצורה"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "הפעולה תמחק ×ת התצורה ×”× ×‘×—×¨×ª. ×”×× ×œ×¢×©×•×ª ×–×ת?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "×ž×¦×¤×™× ×™×"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "הוספת התוסף לשרשרת ה־DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "שמירת תצורת ×”Ö¾DSP × ×›×©×œ×”"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "תצורת DSP חדשה"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "עריכת תצורת DSP"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "תצורות DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "תיקיית הפלט:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "שימור ×ž×‘× ×” התיקיות"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "×©× ×§×•×‘×¥ הפלט:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1807,89 -1843,89 +1887,89 @@@ msgstr "
"סיומות (לדוגמה: .mp3) יתווספו ×וטומטית.\n"
"יש להש×יר ×ת השדה ריק לקבלת ×©× ×‘×¨×¨×ª המחדל ‎(%a - %t)‎."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "מצפין:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "תצורת DSP:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "מספר התהליכי×:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "×ž×‘× ×” דגימת הפלט:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "שמירה על ×ž×‘× ×” המקור"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "מספר ×©×œ× ×¢× ×¡×™×ž×Ÿ ב־8 סיביות"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "מספר ×©×œ× ×¢× ×¡×™×ž×Ÿ ב־16 סיביות"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "מספר ×©×œ× ×¢× ×¡×™×ž×Ÿ ב־24 סיביות"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "מספר ×©×œ× ×¢× ×¡×™×ž×Ÿ ב־32 סיביות"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "מספר ×¢× × ×§×•×“×” צפה ב־32 סיביות"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "×›×שר הקובץ קיי×:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "הצגת בקשה"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "שכתוב"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "עריכת תצורת המצפין"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "מצפין ×œ×œ× ×©×"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "סיומת קובץ הפלט:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "לדוגמה: mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "שורת הפקודה:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1899,7 -1935,7 +1979,7 @@@ msgstr "
"לדוגמה: lame - %o\n"
"%i לציון קובץ קלט, %o לציון קובץ קלט, - עבור הקלט מ־stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1909,66 -1945,72 +1989,72 @@@ msgstr "
"<small>%o - ×©× ×§×•×‘×¥ הפלט\n"
"%i - ×”×©× ×”×–×ž× ×™ לקובץ הקלט</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "שיטה:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "שרשור"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "קובץ ×–×ž× ×™"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>כותב תגיות</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "ערוך תצורות DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "תצורת DSP ×œ×œ× ×©×"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "הוספה"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "×œ× × ×™×ª×Ÿ ×œ×ž×¦×•× ×ת קובץ ×”Ö¾pixmap:†%s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2006,27 -2048,27 +2092,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "עריכה"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "סגירה"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "עריכת הפקודה"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "פקודה:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2035,74 -2077,74 +2121,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "מזהה:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "×©× ×—×•×¤×©×™, למשל „פקודת המעטפת שלי“"
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "הפריט ×מור להופיע בתפריט הר×שי"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2110,90 -2152,90 +2196,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "הוספת פקודה"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "מחיקה"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
- msgstr ""
+ msgstr "×ישור הסרה"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "×¢×¨×›×™× ×©×’×•×™×™×"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "כל ×”×§×‘×¦×™× (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "מחיקת ×§×‘×¦×™× ×ž×”×›×•× ×Ÿ"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "×˜×¢×™× ×ª רשימת השמעה"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "×§×‘×¦×™× ××—×¨×™× (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
- msgstr ""
+ msgstr "שמירת רשימת ההשמעה בש×"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2220,102 -2262,111 +2310,191 @@@ msgstr "
msgid "Nothing is selected."
msgstr "×œ× × ×‘×—×¨ כלו×"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
- msgid "Insert..."
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr "החלפה ב…"
+
+ #: ../plugins/gtkui/widgets.c:777
++>>>>>>> upstream/0.6.2
+ msgid "Insert..."
+ msgstr "הוספה…"
+
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:626
++=======
+ #: ../plugins/gtkui/widgets.c:804
++>>>>>>> upstream/0.6.2
msgid "Cut"
- msgstr ""
+ msgstr "גזירה"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:633
++=======
+ #: ../plugins/gtkui/widgets.c:811
++>>>>>>> upstream/0.6.2
msgid "Copy"
- msgstr ""
+ msgstr "העתקה"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:640
++=======
+ #: ../plugins/gtkui/widgets.c:818
++>>>>>>> upstream/0.6.2
msgid "Paste"
- msgstr ""
+ msgstr "הדבקה"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
- msgid "Lock movement"
++=======
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:1249
++>>>>>>> upstream/0.6.2
+ msgid "Lock movement"
+ msgstr "× ×¢×™×œ×ª ×ª× ×•×¢×”"
+
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1356
++=======
+ #: ../plugins/gtkui/widgets.c:1534
++>>>>>>> upstream/0.6.2
msgid "Move tab left"
- msgstr ""
+ msgstr "העברת ×”×œ×©×•× ×™×ª שמ×לה"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1363
++=======
+ #: ../plugins/gtkui/widgets.c:1541
++>>>>>>> upstream/0.6.2
msgid "Move tab right"
- msgstr ""
+ msgstr "העברת ×”×œ×©×•× ×™×ª ×™×ž×™× ×”"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1370
++=======
+ #: ../plugins/gtkui/widgets.c:1548
++>>>>>>> upstream/0.6.2
msgid "Remove tab"
- msgstr ""
+ msgstr "הסרת ×œ×©×•× ×™×ª"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1377
++=======
+ #: ../plugins/gtkui/widgets.c:1555
++>>>>>>> upstream/0.6.2
msgid "Rename tab"
- msgstr ""
+ msgstr "×©×™× ×•×™ ×©× ×”×œ×©×•× ×™×ª"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1438
++=======
+ #: ../plugins/gtkui/widgets.c:1616
++>>>>>>> upstream/0.6.2
msgid "Add new tab"
- msgstr ""
+ msgstr "הוספת ×œ×©×•× ×™×ª חדשה"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1861
++=======
+ #: ../plugins/gtkui/widgets.c:2036
++>>>>>>> upstream/0.6.2
msgid "Show Column Headers"
- msgstr ""
+ msgstr "הצגת כותרות העמודות"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
- msgid "Expand"
++=======
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
++>>>>>>> upstream/0.6.2
+ msgid "Expand"
+ msgstr "הרחבה"
+
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3027
++=======
+ #: ../plugins/gtkui/widgets.c:3205
++>>>>>>> upstream/0.6.2
msgid "Fill"
- msgstr ""
+ msgstr "מילוי"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
- msgstr ""
+ msgstr "הגדרת לחצן"
+
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr "קולות:"
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
- msgstr ""
+ msgstr "עריכת רשימת השמעה"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
- msgstr ""
+ msgstr "×©×™× ×•×™ ×©× ×¨×©×™×ž×ª ההשמעה"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
- msgstr ""
+ msgstr "הסרת רשימת השמעה"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
- msgstr ""
+ msgstr "הוספת רשימת השמעה חדשה"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
- msgstr ""
+ msgstr "ש×"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
++<<<<<<< HEAD
+msgstr ""
++=======
+ msgstr "סייר רשימות השמעה"
++>>>>>>> upstream/0.6.2
diff --combined po/hr.po
index aff7ccd,87c0a1f..6d6853e
--- a/po/hr.po
+++ b/po/hr.po
@@@ -9,9 -9,9 +9,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Croatian (http://www.transifex.com/projects/p/deadbeef-player/"
"language/hr/)\n"
"Language: hr\n"
@@@ -21,17 -21,17 +27,17 @@@
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "O DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr ""
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF prevoditelji"
@@@ -88,44 -88,44 +94,52 @@@ msgstr "
msgid "Zero Bands"
msgstr ""
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Unaprijed postavljeno"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 dan %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dana %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Zustavljeno | %d zapisi| %s ukupno vrijeme sviranja"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Pauzirano | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -133,747 -133,774 +147,778 @@@ msgstr "
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d zapisi | %s ukupno vrijeme "
"sviranja"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Nova lista izvođenja"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Nova lista izvođenja (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Neuspjeh tijekom Äitanja datoteke pomoći"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Neuspjeh u uÄitavanju datoteke pomoći"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Upozorenje"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Datoteka"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Otvori datoteku(e)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Dodaj datoteku(e)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Dodaj mapu(e)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Dodaj lokaciju"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nova lista izvođenja"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "UÄitaj listu izvoÄ‘enja"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Spremi listu izvođenja"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_IskjluÄi"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Uredi"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_OÄisti"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Odaberi sve"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Poništi odabrano"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Obrnuti odabir"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Odabir"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Ukloni"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr ""
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Nađi"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Naslov"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Broj zapisa"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Umjetnik"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Datum"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "NasumiÄno"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Prolagođeno"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Svojstva"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Pogled"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Statusna traka"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "UjednaÄivaÄ"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Reprodukcija"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Redoslijed"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Linearni"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr ""
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr ""
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr ""
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "KlizaÄ slijedi reprodukciju"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "PokazivaÄ slijedi reprodukciju"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Stop nakon trenutne"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "SkoÄi na trenutni zapis"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Pomoć"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr ""
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_O programu"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr ""
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Traži"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Stop"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Sviraj"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pauza"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Prethodno"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Slijedeće"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Sviraj nasumiÄno"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "O programu"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "IskljuÄi"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Pomoć"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Svojstva zapisa"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Postavke"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Primjeni"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Zatvori"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr ""
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Svojstva"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Naslov:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Unesi naziv novog stupca"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Tip:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr ""
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Svira"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Album Umjetnik"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Umjetnik _ album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Trajanje"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Broj zapisa"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Grupa / album umjetnik"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Format:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Poravnanje:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Lijevo"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Desno"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Odustani"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Izlazni prikljuÄak:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Izlazni uređaj:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Uvijek pretvori 8 bit audio u 16 bit"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Zvuk"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Onemogući"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Zapis"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr ""
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Dodaj datoteke iz naredbanog retka (ili upravljaÄa datotekama) na uvu listu "
"izvođenja:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr ""
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr ""
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Reprodukcija"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Konfiguriraj"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr ""
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_UÄitaj"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr ""
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr ""
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Tekst naslovne trake dok svira:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Tekst naslovne trake kad je zaustavljeno:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr ""
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr ""
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Pozadina"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Srednje"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Svijetlo"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Tamno"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr ""
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Tekst"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr ""
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr ""
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Odabrani red"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Odabrani tekst"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "PokazivaÄ"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Boje liste izvođenja"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Boje"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Omogući proxy poslužitelj"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Adresa proxy poslužitelja:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Port proxy poslužitelja:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Vrsta proxy-a:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Proxy korisniÄko ime:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Proxy lozinka:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Mreža"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -881,122 -908,128 +926,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Verzija: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Autorska prava"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "PrikljuÄci"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Format"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Odaberi DSP prikljuÄak"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "PrikljuÄak"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Piši ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Piši ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Piši APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr ""
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 verzija"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (preporuÄeno)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr ""
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr ""
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1004,91 -1037,100 +1055,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Umjetnik / album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Broj zapisa"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Ukloni sa diska"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Dodaj stupac"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Uredi stupac"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Ukloni stupac"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Grupiraj po"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Ništa"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Umjetnik/datum/album"
@@@ -1105,11 -1147,11 +1169,11 @@@ msgstr "Konfiguriraj %s
msgid "Default Audio Device"
msgstr "Zadani audio uređaj"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1117,7 -1159,7 +1181,7 @@@
msgid "Adding files..."
msgstr "Dodavanje datoteka..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr ""
@@@ -1130,139 -1172,139 +1194,149 @@@ msgid "Really close the window?
msgstr "Stvarno zatvoriti prozor?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr ""
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Vrijednost"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Ime:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Imena polja ne smiju zapoÄinjati sa : ili _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Ne mogu dodati polje"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Polje sa tim imenom već postoji,molim pokušajte s drugim imenom."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Dodaj polje"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Ukloni polje"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Opcije:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help or -h Ispisuje pomoć (ova poruka) i izlazi\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit IskljuÄi sviraÄ\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Ispis info verzije i izlaz\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play PoÄetak reprodukcije\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Zaustavlja reprodukciju\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Zaustavlja reprodukciju\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr ""
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Slijedaća pjesma na listi izvođenja\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Prethodna pjesma na listi izvođenja\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random nasumiÄna pjesma na listi izvoÄ‘enja\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr ""
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1270,7 -1312,7 +1344,7 @@@
" copy[r]ight, [e]lapsed\n"
msgstr ""
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1279,26 -1321,24 +1353,36 @@@ msgstr "
" e.g.: sada svira \"%%a - %%t\" treba ispisati "
"\"umjetnik - naslov\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Zadano"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Da"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Zadano"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Da"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Ne"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1324,7 -1364,7 +1408,7 @@@ msgstr "
"Grupa / Album Umjetnik\n"
"Prilagođeno"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1332,20 -1372,20 +1416,20 @@@ msgstr "
"LIjevo\n"
"Desno"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
"Album"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1353,14 -1393,7 +1437,7 @@@ msgstr "
"2.3 (PreporuÄeno)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr ""
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1370,7 -1403,7 +1447,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1663,7 -1696,7 +1740,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1680,111 -1713,116 +1757,116 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr ""
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr ""
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr ""
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr ""
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Odaberi mapu..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Greška"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Ukloni unaprijed postavljeno"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr ""
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP unaprijed postavljeno"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Izlazna mapa:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Ime izlazne datoteke:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1792,89 -1830,89 +1874,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP unaprijed postavljeno:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr ""
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr ""
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Proširenje izlazne datoteke:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr ""
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Naredbeni redak:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1882,7 -1920,7 +1964,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1890,66 -1928,72 +1972,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Metoda:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Privremena datoteka"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Dodaj"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr ""
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1977,27 -2021,27 +2065,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2006,74 -2050,74 +2094,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2081,90 -2125,90 +2169,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2191,102 -2235,111 +2283,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/hu.po
index bde0589,5e41dbd..b952897
--- a/po/hu.po
+++ b/po/hu.po
@@@ -3,13 -3,14 +3,20 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+ # Péter Polonkai <polesz at nedudu.hu>, 2014
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Hungarian (http://www.transifex.com/projects/p/deadbeef-"
"player/language/hu/)\n"
"Language: hu\n"
@@@ -18,17 -19,17 +25,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "DeaDBeeF %s névjegye"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s Változás napló"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF FordÃtók"
@@@ -85,44 -86,44 +92,52 @@@ msgstr "Preamp nulla
msgid "Zero Bands"
msgstr "Sávok nulla"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
- msgstr ""
+ msgstr "HangszÃnek"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 nap %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d nap %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "MegállÃtva | %d sáv | %s teljes lejátszási idÅ‘"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Monó"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Monó"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Sztereó"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Szünet |"
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -130,870 -131,907 +145,911 @@@ msgstr "
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d sáv | %s teljes lejátszási "
"idő"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Új lejátszólista"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Új lejátszólista (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
- msgstr ""
+ msgstr "Lejátszólista fülekkel"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
- msgstr ""
+ msgstr "Lejátszólista"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
- msgstr ""
+ msgstr "Szétosztás (felső és alsó)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
- msgstr ""
+ msgstr "Szétosztás (bal és jobb)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
- msgstr ""
+ msgstr "Lejátszólista fülek"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
- msgstr ""
+ msgstr "Kiválasztás tulajdonságai"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
- msgstr ""
+ msgstr "Album borÃtó kijelzÅ‘"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
- msgstr ""
+ msgstr "Szkóp"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
- msgstr ""
+ msgstr "Spektrum"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
- msgstr ""
+ msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
- msgstr ""
+ msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
+ msgstr "Gomb"
+
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr "Léptető sáv"
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr "Lejátszó vezérlők"
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr "Hangerő sáv"
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Súgó fájl olvasása sikertelen"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Súgó fájl betöltése sikertelen"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
- msgstr ""
+ msgstr "Még mindig kiszeretne lépni?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Figyelemeztetés"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Fájl"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Fájl(ok) megnyitása"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Fájl(ok) hozzáadása"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Könyvtár(ak) hozzáadása"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Hely hozzáadása"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Új lejátszólista"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Lejátszólista betöltése"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Lejátszólista mentése"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Kilépés"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "Sz_erkesztés"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Törlés"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Mind kiválaszt"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Minden kiválasztást megszüntet"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Kiválasztás megfordÃtása"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Választás"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "EltávolÃtás"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Vágás"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Keresés"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
- msgstr ""
+ msgstr "Rendezés"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "CÃm"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Zeneszám száma"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Előadó"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Dátum"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Véletlenszerű"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Egyéb"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "BeállÃtások"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Nézet"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Státusz sor"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "HangszÃnszabályzó"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
- msgstr ""
+ msgstr "Tervező mód"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Lejátszás"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Sorrend"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Lineáris"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Számok keverése"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Albumok keverése"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Ismétlés"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
- msgstr ""
+ msgstr "Mindet ismétli"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
- msgstr ""
+ msgstr "Egyetlen dal ismétlése"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
- msgstr ""
+ msgstr "Nincs ismétlés"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "A lapozás követi a lejátszást"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "A kurzor követi a lejátszást"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Az aktuális szám után megállÃt"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Ugrás az aktuális számra"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Súgó"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Változás napló"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Névjegy"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "FordÃ_tók"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Keresés"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "MegállÃtás"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Lejátszás"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Szünet"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Előző"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Következő"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Véletlenszerű lejátszás"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Névjegy"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Kilépés"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Súgó"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "A sáv tulajdonságai"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
- msgstr ""
+ msgstr "Hely:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "BeállÃtások"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Alkalmaz"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Bezár"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metaadat"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Tulajdonságok"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "CÃm:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Adja meg a fejléc új cÃmét"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "TÃpus"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Elem index"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Lejátszás"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Album kép"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Előadó - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Időtartam"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Sáv száma"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Zenekar / Album előadó"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Formátum"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "IgazÃtás"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Balra"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Jobbra"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Mégsem"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Kimeneti bÅ‘vÃtmény:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Kimeneti eszköz:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "A 8 bites audiót mindig konvertálja át 16 bitessé"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
- msgstr ""
+ msgstr "Mindig konvertálja a 16 bites audiót 24 bitre"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Hang"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Újrajátszási mód:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Letiltva"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Sáv"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Újrajátszási csúcs skála"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Újrajátszás elÅ‘erÅ‘sÃtése:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Ãltalanos elÅ‘erÅ‘sÃtés:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Fájlok hozzáadása parancssorból (vagy fájl kezelőből) a lejátszólistához"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "ElÅ‘zÅ‘ állapot helyreállÃtása indÃtáskor"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Ne adja hozzá az archÃvumok tartalmát mappák hozzáadásakor"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Lejátszás"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "BeállÃtás"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr ""
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Betöltés"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Bezáráskor a tálcára kerül"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Rendszertálca ikon elrejtése"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
- msgid "Enable Russian CP1251 detection and recoding"
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
+ msgid "Enable Russian CP1251 detection and recoding"
+ msgstr "Orosz CP1251 karakterkészlet detektálás és újrakódolás engedélyezése"
+
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
- msgstr ""
+ msgstr "KÃnai CP936 karakterkészlet detektálás és újrakódolás engedélyezése"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Felhasználói felület képfrissÃtési rátája ( / mp ):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "CÃmsáv szöveg szám lejátszásakor:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "CÃmsáv szöveg ha nincs lejátszás:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "GUI beépülÅ‘ (újraindÃtás szükséges):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
- msgstr ""
+ msgstr "Lejátszó"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
- msgstr ""
+ msgstr "Lejátszólista bezárása középső egér gombbal"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
- msgstr ""
+ msgstr "Az éppen játszott dal félkövér betűtÃpussal"
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Elrejti a \"Törlés a lemezről\" menü elemet"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Lejátszási listák automatikus elnevezése egyetlen mappa hozzáadásakor"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
- msgstr ""
+ msgstr "Oszlopok automatikus átméretezése az ablak kitöltéséhez"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
- msgstr ""
+ msgstr "GUI/Egyéb"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "FelülÃrás"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Előtér"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Háttér"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "IdÅ‘sáv/HangerÅ‘ szÃnek"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Közép"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Világos"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Sötét"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Alap"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Szöveg"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Fülek szÃne"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"FelülÃrás (elveszti a GTK treeview témát, de gyorsul a rajzolás sebessége)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Páros sor"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Páratlan sor"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Kiválasztott sor"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Kiválasztott szöveg"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Kurzor"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Lejátszólista szÃnek"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "SzÃnek"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Proxy szerver engedélyezése"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Proxy szerver cÃm:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Proxy szerver port:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Proxy tÃpusa:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Proxy felhasználónév:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Proxy jelszó:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
- msgstr ""
+ msgstr "HTTP Felhasználó azonosÃtó:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Hálózat"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
- msgstr ""
+ msgstr "Hozzárendelt gyorsbillentyűk:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
- msgstr ""
+ msgstr "Akció:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
- msgstr ""
+ msgstr "<Nincs beállÃtva>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
- msgstr ""
+ msgstr "Billentyű kombináció:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
- msgstr ""
+ msgstr "Globális billentyűk"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
"The changes will NOT be saved\n"
"if you don't press Apply."
msgstr ""
+ "Használd az Alkalmaz gombot a változások mentéséhez,\n"
+ "vagy a Visszavonás gombot a változások elvetéséhez.\n"
+ "A változások NEM lesznek mentve\n"
+ "amÃg nem nyomja meg az Alkalmaz gombot."
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
- msgstr ""
+ msgstr "_Alapértelmezett"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
- msgstr ""
+ msgstr "Billentyűk"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Verzió:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Copyright"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "BÅ‘vÃtmények"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr "Egyedi CÃm megadása"
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
- msgstr ""
+ msgstr "CsoportosÃtás ..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
- msgstr ""
+ msgstr "Rendezés ..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Formátum"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Növekvő"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Csökkenő"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "DSP beépülő kiválasztása"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Beépülő"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "CÃmkeÃró beállÃtásai"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ID3v2 Ãrása"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ID3v1 Ãrása"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "APEv2 Ãrása"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "ID3v2 vágása"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "ID3v1 vágása"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "APEv2 vágása"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 verzió"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Ajánlott)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v2 karakter kódolás (alapértelmezés iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ID3v2.4 Ãrása"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1001,91 -1039,100 +1057,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
- msgstr ""
+ msgstr "Alapértékekre állÃt"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
- msgstr ""
+ msgstr "BÅ‘vÃtmények:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
- msgstr ""
+ msgstr "Gombok beállÃtása"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
- msgstr ""
+ msgstr "SzÃn:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
- msgstr ""
+ msgstr "Szöveg szÃn:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
- msgstr ""
+ msgstr "Ikon:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
- msgstr ""
+ msgstr "CÃmke:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
+ msgstr "Válassz műveletet"
+
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Előadó / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Sáv száma"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Hozzáadás a lejátszási sorhoz"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr "Lejátszólista várakozósorhoz adás"
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Törlés a lejátszási sorból"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr "Lejátszólista várakozósorból törlés"
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Metaadat újratöltése"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr "Metaadatok újratöltése"
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
msgstr "Törlés a lemezről"
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Oszlop hozzáadása"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Oszlop szerkesztése"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Öszlop törlése"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Csoport"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Nincs"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Előadó/Dátum/Album"
@@@ -1102,19 -1149,19 +1171,19 @@@ msgstr "%s beállÃtása
msgid "Default Audio Device"
msgstr "Alapértelmezett Audio Eszköz"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
- msgstr ""
+ msgstr "Valóban szeretné folytatni mentés nélkül?"
#: ../plugins/gtkui/progress.c:56
msgid "Adding files..."
msgstr "Fájlok hzzáadása..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Inicializálás..."
@@@ -1127,141 -1174,141 +1196,151 @@@ msgid "Really close the window?
msgstr "Valóban bezárja az ablakot?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
- msgstr ""
+ msgstr "[Többszörös értékek]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Billentyű"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Billentyű"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Érték"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
- msgstr ""
+ msgstr "[Többszörös értékek]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "CÃmkék Ãrása..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
- msgstr ""
+ msgstr "Mező neve"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Név:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "A szövegmezők tartalma nem kezdődhet kettősponttal vagy aláhúzásjellel"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Mező hozzáadása sikertelen"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
"Egy azonos névvel rendelkező mező már létezik, adj meg egy másik nevet."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Mező hozzáadása"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "MezÅ‘ eltávolÃtása"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
- msgstr ""
+ msgstr "Használat: deadbeef [opciók] [--] [fájl(ok)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Opciók:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help vagy -h Súgó megjelenÃtése (ez az üzenet) és kilépt\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Kilépés a lejátszóból\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Verzió információ megjelenÃtése és kilépés\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Lejátszás indÃtása\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Lejátszás megállÃtása\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Lejátszás szüneteltetése\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Lejátszás/Szüneteltetés\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
" --play-pause Lejátszás indÃtása, lejátszás közben szüneteltetés\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Ugrás a következő számra a lejátszólistában\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Ugrás az előző számra a lejátszólistában\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Véletlenszerű szám a lejátszólistáról\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Fájl(ok) hozzáadása a létező lejátszólistához\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Szám nevének formázott kiÃrása az stdout-ra\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1272,7 -1319,7 +1351,7 @@@ msgstr "
" [l]hossz, [n]sávszáma, [y]év, [c]megjegyzés,\n"
" copy[r]ight, [e]ltelt idő\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1281,28 -1328,24 +1360,36 @@@ msgstr "
" pl.: --nowplaying \"%%a - %%t\" kiÃrása kerül \"elÅ‘adó "
"- cÃm\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " további információ: http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Alapértelmezett"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Igen"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Alapértelmezett"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Igen"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Nem"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1328,7 -1371,7 +1415,7 @@@ msgstr "
"Zenekar / Album Előadó\n"
"Egyéb"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1336,7 -1379,7 +1423,7 @@@ msgstr "
"Balra\n"
"Jobbra"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1346,7 -1389,7 +1433,7 @@@ msgstr "
"Sáv\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1354,7 -1397,7 +1441,7 @@@ msgstr "
"Növekvő\n"
"Csökkenő"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1362,14 -1405,7 +1449,7 @@@ msgstr "
"2.3 (Ajánlott)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Nem található a képfájl: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1382,7 -1418,7 +1462,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1434,7 -1470,7 +1514,7 @@@ msgstr "
#. OSS output plugin
#: ../translation/extra.c:18
msgid "Device file"
- msgstr ""
+ msgstr "Eszköz fájl"
#: ../translation/extra.c:19
msgid "OSS4 samplerate bug workaround"
@@@ -1501,7 -1537,7 +1581,7 @@@ msgstr "Újramintavételezés minőség
#: ../translation/extra.c:37
msgid "8-bit output (default is 16)"
- msgstr ""
+ msgstr "8-bites kimenet (alapértelmezett 16)"
#. Game_Music_Emu decoder plugin
#: ../translation/extra.c:39
@@@ -1510,7 -1546,7 +1590,7 @@@ msgstr "Maximális szám hossz (percben
#: ../translation/extra.c:40
msgid "Fadeout length (seconds)"
- msgstr ""
+ msgstr "ElhalkÃtás hossza (másodperc)"
#: ../translation/extra.c:41
msgid "Play loops nr. of times (if available)"
@@@ -1544,7 -1580,7 +1624,7 @@@ msgstr "ÉrtesÃtés cÃmének formátu
#: ../translation/extra.c:50
msgid "Notification content format"
- msgstr ""
+ msgstr "ÉrtesÃtési tartalom formátuma"
#: ../translation/extra.c:51
msgid "Show album art"
@@@ -1591,7 -1627,7 +1671,7 @@@ msgstr "Bitek száma mintánként (8 /
#: ../translation/extra.c:65
msgid "Default song length (sec)"
- msgstr ""
+ msgstr "Alapértelmezett dal hossz (mp)"
#. WildMidi player plugin
#: ../translation/extra.c:67
@@@ -1667,7 -1703,7 +1747,7 @@@ msgstr "Cél mintavételezési rátája
#: ../translation/extra.c:94
msgid "Quality / Algorithm"
- msgstr ""
+ msgstr "Minőség / Algoritmus"
#: ../translation/extra.c:95
msgid "Automatic Samplerate (overrides Target Samplerate)"
@@@ -1675,13 -1711,13 +1755,13 @@@ msgstr "Automatikus mintavételezi rát
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
#: ../translation/extra.c:99
msgid "Disable gapless playback (faster scanning)"
- msgstr ""
+ msgstr "Szünetmentes (gapless) lejátszás tiltása (gyorsabb keresés)"
#. adplug
#: ../translation/extra.c:101
@@@ -1690,278 -1726,295 +1770,295 @@@ msgstr "
#: ../translation/extra.c:102
msgid "Enable surround"
- msgstr ""
+ msgstr "Surround engedélyezése"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr "[BeépÃtett] %s"
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Azonos nevű fájl már létezik. FelülÃrjam?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Konvertálási figyelmeztetés"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Kérlek, válassz egy enkódert"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Konvertálási hiba"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Konvertálás..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Mappa kiválasztása..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Hiba"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Új enkóder hozzáadása"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Enkóder szerkesztése"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Mentett hangszÃn törlése"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
- msgstr ""
+ msgstr "Kódolók"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
- msgstr ""
+ msgstr "Kimeneti könyvtár:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
- msgstr ""
+ msgstr "Ãrás a dal forrás könyvtárába"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
- msgstr ""
+ msgstr "Mappa struktúra megtartása"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
- msgstr ""
+ msgstr "Kimeneti fájlnév:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
"Extension (e.g. .mp3) will be appended automatically.\n"
"Leave the field empty for default (%a - %t)."
msgstr ""
+ "A kiterjesztés (pl: .mp3) automatikusan hozzáadódi.\n"
+ "Hagy üresen a mezőt az alapértelmezéshez (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
- msgstr ""
+ msgstr "Kódoló:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
- msgstr ""
+ msgstr "Szálak száma:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
- msgstr ""
+ msgstr "Kimeneti minta formátuma:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
- msgstr ""
+ msgstr "Forrás formátum megtartása"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
- msgstr ""
+ msgstr "32 bit lebegőpontos"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
- msgstr ""
+ msgstr "Ha a fájl létezik:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
- msgstr ""
+ msgstr "Kérdés"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
- msgstr ""
+ msgstr "FelülÃrás"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
- msgstr ""
+ msgstr "Névtelen kódoló"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
- msgstr ""
+ msgstr "Kimeneti fájl kiterjesztése:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
- msgstr ""
+ msgstr "Például: mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
- msgstr ""
+ msgstr "Parancssor:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
"Example: lame - %o\n"
"%i for input file, %o for output file, - for stdin"
msgstr ""
+ "Példa: lame - %o\n"
+ "%i bemeneti fájlnév, %o kimeneti fájlnév, - stdin használata"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
"<small>%o - output file name\n"
"%i - temporary input file name</small>"
msgstr ""
+ "<small>%o - kimeneti fájlnév\n"
+ "%i - átmeneti bemeneti fájlnév</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
- msgstr ""
+ msgstr "Metódus:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
- msgstr ""
+ msgstr "Cső"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
- msgstr ""
+ msgstr "Ãtmeneti fájl"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
- msgstr ""
+ msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
- msgstr ""
+ msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
- msgstr ""
+ msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
- msgstr ""
+ msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
- msgstr ""
+ msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
- msgstr ""
+ msgstr "<b>CÃmkeÃró</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Hozzáadés"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Nem található a képfájl: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1977,39 -2030,43 +2074,43 @@@ msgid "
"Prompt\n"
"Overwrite"
msgstr ""
+ "Kérdés\n"
+ "FelülÃrás"
#: ../plugins/converter/converter.glade.h:34
msgid ""
"Pipe\n"
"Temporary file"
msgstr ""
+ "Cső\n"
+ "Ãtmeneti fájl"
#: ../plugins/shellexecui/interface.c:46
#: ../plugins/shellexecui/shellexec.glade.h:1
msgid "Custom Shell Commands"
- msgstr ""
+ msgstr "Egyedi héjparancsok"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
- msgstr ""
+ msgstr "Szerkeszt"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
- msgstr ""
+ msgstr "Bezár"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
- msgstr ""
+ msgstr "Szerkesztő parancs"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
- msgstr ""
+ msgstr "Parancs:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2018,74 -2075,74 +2119,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
- msgstr ""
+ msgstr "ID:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
- msgstr ""
+ msgstr "Egyedi számok"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
- msgstr ""
+ msgstr "Csak egy dalnál működik."
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
- msgstr ""
+ msgstr "Többszörös Sávok"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
- msgstr ""
+ msgstr "Működik többszörös sávokon is."
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
- msgstr ""
+ msgstr "Helyi"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
- msgstr ""
+ msgstr "Munka csak helyi fájlokkal"
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
- msgstr ""
+ msgstr "Távoli"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
- msgstr ""
+ msgstr "Munka csak távoli fájlokkal (például: http:// folyamok)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
- msgstr ""
+ msgstr "Ãltalános (FÅ‘menü)"
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2093,92 -2150,94 +2194,98 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
- msgstr ""
+ msgstr "Parancs hozzáadása"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
- msgstr ""
+ msgstr "Törlés"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
- msgstr ""
+ msgstr "Ez törli a kiválasztott héj parancsot. Valóban akarja?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
- msgstr ""
+ msgstr "Törlés jóváhagyva"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
- msgstr ""
+ msgstr "ID nem lehet üres vagy egyedi\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
- msgstr ""
+ msgstr "CÃm nem lehet üres.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
- msgstr ""
+ msgstr "Héjparancs nem lehet üres.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
- msgstr ""
+ msgstr "Érvénytelen érték"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
- msgstr ""
+ msgstr "Támogatott hangformátumok"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
- msgstr ""
+ msgstr "Minden fájl (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
- msgstr ""
+ msgstr "Fájlok megnyitása..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
- msgstr ""
+ msgstr "Fájlok hozzáadása a lejátszólistához..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
- msgstr ""
+ msgstr "Mappák hozzáadása a lejátszólistához..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
- msgstr ""
+ msgstr "Szimbolikus linkek követése"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
- msgstr ""
+ msgstr "help.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
- msgstr ""
+ msgstr "Fájlok törlése a diszkről"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
+ "A fájlok el fognak veszi. Folytatja?\n"
+ "(Ez a párbeszéd ablak kikapcsolható a GTKUI bÅ‘vÃtmény beállÃtásaiban)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
- msgstr ""
+ msgstr "Lejátszólista betöltése"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
- msgstr ""
+ msgstr "Egyéb fájlok (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
- msgstr ""
+ msgstr "Lejátszólista mentése másként"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
- msgstr ""
+ msgstr "DeadBeeF lejátszólista fájlok (*.dbpl)"
#: ../plugins/gtkui/ctmapping.c:129
msgid "Content-Type"
@@@ -2186,7 -2245,7 +2293,7 @@@ msgstr "
#: ../plugins/gtkui/ctmapping.c:199
msgid "Invalid value(s)."
- msgstr ""
+ msgstr "Érvénytelen érték(ek)."
#: ../plugins/gtkui/ctmapping.c:200
msgid ""
@@@ -2201,104 -2260,113 +2308,189 @@@ msgstr "
#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
msgid "Nothing is selected."
+ msgstr "Semmi nincs kiválasztva."
+
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
++=======
+ #: ../plugins/gtkui/widgets.c:772
++>>>>>>> upstream/0.6.2
msgid "Replace with..."
- msgstr ""
+ msgstr "Csere erre..."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:599
++=======
+ #: ../plugins/gtkui/widgets.c:777
++>>>>>>> upstream/0.6.2
msgid "Insert..."
- msgstr ""
+ msgstr "Beszúrás..."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:626
++=======
+ #: ../plugins/gtkui/widgets.c:804
++>>>>>>> upstream/0.6.2
msgid "Cut"
- msgstr ""
+ msgstr "Kivág"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:633
++=======
+ #: ../plugins/gtkui/widgets.c:811
++>>>>>>> upstream/0.6.2
msgid "Copy"
- msgstr ""
+ msgstr "Másol"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:640
++=======
+ #: ../plugins/gtkui/widgets.c:818
++>>>>>>> upstream/0.6.2
msgid "Paste"
- msgstr ""
+ msgstr "Beilleszt"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
- msgid "Lock movement"
++=======
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:1249
++>>>>>>> upstream/0.6.2
+ msgid "Lock movement"
+ msgstr "Mozgatás megakadályozása"
+
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1356
++=======
+ #: ../plugins/gtkui/widgets.c:1534
++>>>>>>> upstream/0.6.2
msgid "Move tab left"
- msgstr ""
+ msgstr "Fül mozgatása balra"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1363
++=======
+ #: ../plugins/gtkui/widgets.c:1541
++>>>>>>> upstream/0.6.2
msgid "Move tab right"
- msgstr ""
+ msgstr "Fül mozgatása jobbra"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1370
++=======
+ #: ../plugins/gtkui/widgets.c:1548
++>>>>>>> upstream/0.6.2
msgid "Remove tab"
- msgstr ""
+ msgstr "Fül törlése"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1377
++=======
+ #: ../plugins/gtkui/widgets.c:1555
++>>>>>>> upstream/0.6.2
msgid "Rename tab"
- msgstr ""
+ msgstr "Fül átnevezése"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1438
++=======
+ #: ../plugins/gtkui/widgets.c:1616
++>>>>>>> upstream/0.6.2
msgid "Add new tab"
- msgstr ""
+ msgstr "Új fül hozzáadása"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1861
++=======
+ #: ../plugins/gtkui/widgets.c:2036
++>>>>>>> upstream/0.6.2
msgid "Show Column Headers"
- msgstr ""
+ msgstr "Oszlop fejlécek mutatása"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
- msgid "Homogeneous"
++=======
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3157
++>>>>>>> upstream/0.6.2
+ msgid "Homogeneous"
+ msgstr "Homogén"
+
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3019
++=======
+ #: ../plugins/gtkui/widgets.c:3197
++>>>>>>> upstream/0.6.2
msgid "Expand"
- msgstr ""
+ msgstr "Kiterjesztés"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3027
++=======
+ #: ../plugins/gtkui/widgets.c:3205
++>>>>>>> upstream/0.6.2
msgid "Fill"
- msgstr ""
+ msgstr "Kitöltés"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
- msgstr ""
+ msgstr "Gombok beállÃtása"
+
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr "Hangok:"
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
- msgstr ""
+ msgstr "Lejátszólista szerkesztése"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
- msgstr ""
+ msgstr "Lejátszólista átnevezése"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
- msgstr ""
+ msgstr "Lejátszólista törlése"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
- msgstr ""
+ msgstr "Új lejátszólista hozzáadása"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
- msgstr ""
+ msgstr "Név"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
- msgstr ""
+ msgstr "Lejátszólista böngésző"
diff --combined po/id.po
index 4db6869,34d7213..494bc15
--- a/po/id.po
+++ b/po/id.po
@@@ -8,9 -8,9 +8,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Indonesian (http://www.transifex.com/projects/p/deadbeef-"
"player/language/id/)\n"
"Language: id\n"
@@@ -19,17 -19,17 +25,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Tentang DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "ChangeLog DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Penerjemah DeaDBeeF"
@@@ -86,794 -86,818 +92,830 @@@ msgstr "Nolkan Preamp
msgid "Zero Bands"
msgstr "Zero Bands"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Preset"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 hari %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d hari %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Berhenti | %d trek | %s waktu putar total"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Jeda | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d trek | %s waktu putar total"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Daftar Putar Baru"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Daftar Putar Baru (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Daftar putar dengan tab"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Daftar putar"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "Pembelah (atas dan bawah)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "Pembelah (kiri dan kanan)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Tab daftar putar"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Properti pilihan"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Tampilan seni album"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "Spektrum"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Tombol"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Gagal saat membaca berkas bantuan"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Gagal memuat berkas bantuan"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- "Pemutar sedang menjalankan tugas latar belakang. Bila Anda keluar sekarang, "
- "tugas-tugas itu akan dibatalkan atau diputus. Ini bisa menyebabkan "
- "kehilangan data."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "Anda masih ingin keluar?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Peringatan"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Berkas"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Buka berkas"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Tambah berkas"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Tambah folder"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Tambah lokasi"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Daftar putar baru"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Muat daftar putar"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Simpan daftar putar"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Keluar"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Sunting"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Bersihkan"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Pilih semua"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Pilih tak satupun"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Balik pilihan"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Pilihan"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Buang"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Crop"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Cari"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Urut menurut"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Judul"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Nomor trek"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artis"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Tanggal"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Acak"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Ubahan"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Preferensi"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Tilik"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Bilah status"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Equalizer"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "Mode rancangan"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Putar"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Urutan"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Linier"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Acak trek"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Acak album"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Perulangan"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Ulang semua"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Ulang satu lagu"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Jangan ulangi"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Gulir berikut pemutaran"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Kursor berikut pemutaran"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Berhenti setelah ini"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Lompat ke trek kini"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "Ba_ntuan"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_ChangeLog"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "Tent_ang"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Penerjemah"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Cari"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Berhenti"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Putar"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Jeda"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Sebelumnya"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Selanjutnya"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Putar Acak"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Tentang"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Keluar"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Bantuan"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Properti Trek"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "Lokasi:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Pengaturan"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "Ter_apkan"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Tutup"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadata"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Properti"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Judul:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Masukkan judul kolom baru disini"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Jenis:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Indeks Butir"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Memutar"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Album Seni"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Artis - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Durasi"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Nomor Trek"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Band / Artis Album"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Format:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Perataan:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Kiri"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Kanan"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Batal"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Keluaran plugin:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Perangkat keluaran:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Selalu konversikan audio 8 bit ke 16 bit"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Suara"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Mode replaygain:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Matikan"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Trek"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Skala puncak replaygain"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Replaygain preamp:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Preamp global:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Tambahkan berkas dari baris perintah (atau manajer berkas) ke daftar putar "
"ini:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Lanjutkan sesi sebelumnya pada awal mula"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Jangan tambahkan dari arsip ketika menambahkan folder"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr ""
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Tata"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Preset Rantai DSP"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Muat"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Menutup meminimalkan ke baki"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Sembunyikan ikon baki sistem"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "Fungsikan deteksi dan pengodean ulang CP1251 Rusia"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Fungsikan deteksi dan pengodean ulang CP936 Cina"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Laju penyegaran antar muka (berapa kali per detik):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Teks bilah judul ketika memutar:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Teks bilah judul ketika berhenti:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "Plugin GUI (mengubah perlu memulai ulang):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Sembunyikan butir menu konteks \"Hapus dari disk\""
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Namai otomatis daftar putar ketika menambahkan sebuah folder"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "GUI/Rupa-rupa"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Timpa"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Latar depan"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Latar belakang"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Warna bilah loncat/volume"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Tengah"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Terang"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Gelap"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Basis"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Teks"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Warna strip tab"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "Timpa (kehilangan tilikan pohon GTK, tapi mempercepat perenderan)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Baris genap"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Baris ganjil"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Baris yang dipilih"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Teks yang dipilih"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Kursor"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Warna daftar putar"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Warna"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Aktifkan Server Proksi"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Alamat Server Proksi:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Port Server Proksi:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Jenis Proksi:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Nama Pengguna Proksi:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Sandi Proksi:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "HTTP User Agent:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "Sunting Pemetaan Content-Type (tipe isi)"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Jaringan"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<Tak ditata>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Tombol pintas global"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -881,122 -905,128 +923,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "Tombol pintas"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Versi:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Hak cipta"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Plugin"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "Kelompokkan Menurut ..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "Urutkan menurut ..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Format"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Naik"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Turun"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Pilih Plugin DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Plugin"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Pengaturan Penulis Tag"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Tulis ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Tulis ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Tulis APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Hapus ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Hapus ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Hapus APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "Versi ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Disarankan)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "Pengodean karakter ID3v1 (bawaan adalah iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Tulis ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "Pemetaan Content-Type"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1004,91 -1034,100 +1052,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "Reset ke nilai bawaan"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "Content-Type:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "Plugin:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Artis / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "No Trek"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Tambahkan ke antrian daftar putar"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Hapus dari antrian putar"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Muat ulang metadata"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Hapus dari disk"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Tambah kolom"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Sunting kolom"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Hapus kolom"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Kelompokkan berdasarkan"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Tak ada"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Artis/Tanggal/Album"
@@@ -1105,11 -1144,11 +1166,11 @@@ msgstr "Tata %s
msgid "Default Audio Device"
msgstr "Perangkat Suara Bawaan"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1117,7 -1156,7 +1178,7 @@@
msgid "Adding files..."
msgstr "Menambah berkas..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Menginisialisasi..."
@@@ -1130,102 -1169,102 +1191,112 @@@ msgid "Really close the window?
msgstr "Yakin akan menutup jendela?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Nilai berganda]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Kunci"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Kunci"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Nilai"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[Nilai berganda]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Menulis tag..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Nama ruas"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Nama:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Nama ruas tak boleh diawali dengan : atau _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Tak bisa menambah ruas"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Ruas dengan nama itu sudah ada, harap coba nama lain."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Tambah ruas"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Hapus ruas"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "Cara pakai: deadbeef [opsi] [--] [berkas]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Opsi:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help or -h Cetak bantuan (pesan ini) dan keluar\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Keluar dari pemutar\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Cetak info versi dan keluar\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Mulai memutar\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Berhenti memutar\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Jeda memutar\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Jungkitkan jeda\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1233,39 -1272,39 +1304,39 @@@ msgstr "
" --play-pause Mulai memutar bila berhenti, jungkitkan jeda bila "
"tidak\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Lagu selanjutnya di daftar putar\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Lagu sebelumnya di daftar putar\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Acak lagu di daftar main\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr ""
" --queue Tambahkan berkas ke daftar putar yang telah ada\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1273,33 -1312,31 +1344,43 @@@
" copy[r]ight, [e]lapsed\n"
msgstr ""
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
"- title\"\n"
msgstr ""
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Bawaan"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Ya"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Bawaan"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Ya"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Tidak"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1314,7 -1351,7 +1395,7 @@@
"Custom"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1322,7 -1359,7 +1403,7 @@@ msgstr "
"Kiri\n"
"Kanan"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1332,7 -1369,7 +1413,7 @@@ msgstr "
"Trek\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1340,7 -1377,7 +1421,7 @@@ msgstr "
"Naik\n"
"Turun"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1348,14 -1385,7 +1429,7 @@@ msgstr "
"2.3 (Disarankan)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Tak bisa temukan berkas pixmap: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1365,8 -1395,8 +1439,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "Tambahkan CD audio"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1658,8 -1688,8 +1732,8 @@@ msgstr "Laju Cuplik Otomatis (menimpa L
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "Tata perintah shell gubahan"
+ msgid "Configure Custom Shell Commands"
+ msgstr ""
#. mpgmad
#: ../translation/extra.c:99
@@@ -1675,111 -1705,116 +1749,116 @@@ msgstr "Lebih suka emu Ken daripada Sat
msgid "Enable surround"
msgstr "Fungsikan surround"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Berkas telah ada. Timpa?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Peringatan pengonversi"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Harap pilih enkoder"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Kesalahan pengonversi"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Mengonversi..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Pilih folder..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Gagal menyimpan preset enkoder"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Kesalahan"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Tambahkan enkoder baru"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Sunting enkoder"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Hapus preset"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Enkoder"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr ""
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr ""
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1787,89 -1822,89 +1866,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 bit signed int"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 bit signed int"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 bit signed int"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 bit signed int"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 bit float"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Tanya"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Timpa"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr ""
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Mis. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr ""
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1877,7 -1912,7 +1956,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1885,66 -1920,72 +1964,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Metoda:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Pipe"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Berkas temporer"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Penulis tag</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "Penyunting Preset DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Preset DSP Tanpa Judul"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Tambah"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Tak bisa temukan berkas pixmap: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1972,27 -2013,27 +2057,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "Sunting"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "Tutup"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "Perintah Sunting"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "Perintah:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2001,74 -2042,74 +2086,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "ID:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2076,72 -2117,72 +2161,76 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "Hapus"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr "Aksi ini akan menghapus perintah shell yang dipilih. Anda yakin?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "Konfirmasi Hapus"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "Nilai Tak Valid"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "Format suara yang didukung"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "Semua berkas (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "Buka berkas..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "Tambahkan berkas ke daftar putar..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "Tambahkan folder ke daftar putar..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "Ikuti symlink"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "Hapus berkas dari disk"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2149,19 -2190,19 +2238,19 @@@ msgstr "
"Berkas akan hilang. Lanjut?\n"
"(Dialog ini dapat dimatikan dalam pengaturan plugin GTKUI)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "Muat Daftar Putar"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "Berkas lain (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "Simpan Daftar Putar Sebagai"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "Berkas daftar putar DeaDBeeF (*.dbpl)"
@@@ -2188,102 -2229,111 +2277,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr "Tak ada yang dipilih."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/it.po
index 7112b97,9c7b087..e6a1645
--- a/po/it.po
+++ b/po/it.po
@@@ -7,9 -7,9 +7,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Italian (http://www.transifex.com/projects/p/deadbeef-player/"
"language/it/)\n"
"Language: it\n"
@@@ -18,17 -18,17 +24,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "A proposito di DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeadBeeF %s Changelog"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr ""
@@@ -85,789 -85,816 +91,828 @@@ msgstr "Pre-ampl a zero
msgid "Zero Bands"
msgstr "Bande a zero"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 giorno %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d giorni %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Stop | %d tracce | %s tempo totale"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps"
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Pausa |"
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracce | %s tempo totale"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Nuova playlist"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Nuova Playlist (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Fallita la lettura del file di aiuto"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Fallito il caricamento del file di aiuto"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Attenzione"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_File"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Apri file"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Aggiungi file"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Aggiungi cartella/e"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Aggiungi locazione"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nuova playlist"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Carica playlist"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Salva playlist"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Esci"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Modifica"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Pulisci"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Seleziona tutto"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Deseleziona tutto"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Inverti selezione"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Selezione"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Rimuovi"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Raccolte"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Cerca"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Titolo"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr ""
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artista"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr ""
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Casuale"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Personalizza"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Preferenze"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Visualizza"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Barra di stato"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Equalizzatore"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Riproduzione"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Ordina"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Lineare"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr ""
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr ""
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Looping"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Scorri seguente riproduzione"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "La selezione segue la riproduzione"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Stop finita la canzone"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr ""
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Aiuto"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Changelog"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr ""
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_About"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr ""
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Cerca"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Stop"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Riproduci"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pausa"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Precedente"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Prossima"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Riproduzione casuale"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "About"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Esci"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Aiuto"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Proprietà traccia"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Applica"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Chiudi"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadata"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Proprietà "
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Titolo:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Inserisci nuovo titolo colonna qui"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Tipo:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr ""
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Riproduzione"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Album Art"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Artista - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Durata"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr ""
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Band / Album Artista"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Formato:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Allineamento:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Sinistra"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Destra"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "A_nnulla"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Plugin d'uscita:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Dispositivo d'uscita:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Suono"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Modalità ripetizione:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Disabilita"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Traccia"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Modalità di ReplayGain (volume regolabile)"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr "Aggiungi files da linea di comando (o file manager) a questa playlist:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Riprendi sessione precedente all'avvio"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr ""
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Riproduzione"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Configura"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr ""
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr ""
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr ""
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Chiudi minimizza nel vassoio di sistema"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Nasconde l'icona nel vassoio di sistema"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Testo della titlebar mentre riproduce:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Testo della titlebar quando fermata:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Nascondi \"Cancella dal disco\" dal menù contestuale"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Sovrascrivere"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Primo piano"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Di fondo"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Colori della Seekbar/Barra del volume"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Centrale"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Chiaro"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Scuro"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Base"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Testo"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Colore delle schede"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "Sovrascrivi (perdita del tema GTK ma rendering più veloce)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Righe pari"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Righe dispari"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Riga selezionata"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Testo selezionato"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Cursore"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Colori della playlist"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Colori"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Abilita il server proxy"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Indirizzo del server proxy:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Porta del server proxy:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Tipo proxy:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Nome utente del proxy:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Password del proxy"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Rete"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -875,122 -902,128 +920,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr ""
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr ""
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Plugins"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr ""
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Scrivi ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Scrivi ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Scrivi APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Strip ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Strip ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Strip APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "Versione ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (raccomandato)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 codifica caratteri (predefinito iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Scrivi ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -998,91 -1031,100 +1049,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Artista / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Traccia N°"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Aggiungi alla coda di riproduzione"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Rimuovi dalla coda di riproduzione"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Ricarica metadati"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Rimuovi dal disco"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Aggiungi colonna"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Modifica colonna"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Rimuovi colonna"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Raggruppamento"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Nessuno"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Artista/Data/Album"
@@@ -1099,11 -1141,11 +1163,11 @@@ msgstr "
msgid "Default Audio Device"
msgstr "Dispositivo audio predefinito"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1111,7 -1153,7 +1175,7 @@@
msgid "Adding files..."
msgstr "Sto aggiungendo i files..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Inizializzazione..."
@@@ -1124,140 -1166,140 +1188,150 @@@ msgid "Really close the window?
msgstr "Vuoi davvero chiudere la finestra?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Tasti"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Tasti"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Valore"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr ""
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Opzioni:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help or -h Stampa l'aiuto ed esce\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Esce dal player\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Stampa la versione ed esce\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Inizia la riproduzione\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Ferma la riproduzione\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pausa nella riproduzione\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr ""
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Canzone successiva nella playlist\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Canzone precedente nella playlist\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Canzone casuale nella playlist\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Aggiunge file(s) ad una playlist esistente\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
" --nowplaying FMT Stampa il nome della traccia formattato in stdout\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1268,7 -1310,7 +1342,7 @@@ msgstr "
" [l]unghezza, traccia[n]umero, [y]anno, [c]ommento,\n"
" copy[r]ight, [e]trascorso\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1277,26 -1319,24 +1351,36 @@@ msgstr "
" es: --nowplaying \"%%a - %%t\" dovrebbe stampare "
"\"artista - titolo\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Predefinito"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Sì"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Predefinito"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Sì"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "No"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1311,7 -1351,7 +1395,7 @@@
"Custom"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1319,7 -1359,7 +1403,7 @@@ msgstr "
"Sinistra\n"
"Destra"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1329,13 -1369,13 +1413,13 @@@ msgstr "
"Traccia\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1343,14 -1383,7 +1427,7 @@@ msgstr "
"2.3 (raccomandato)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "File pixmap non trovato: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1363,7 -1396,7 +1440,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1656,7 -1689,7 +1733,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1673,111 -1706,116 +1750,116 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr ""
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr ""
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr ""
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr ""
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr ""
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr ""
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr ""
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr ""
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr ""
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr ""
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1785,89 -1823,89 +1867,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr ""
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr ""
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr ""
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr ""
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr ""
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1875,7 -1913,7 +1957,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1883,66 -1921,72 +1965,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr ""
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr ""
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr ""
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr ""
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr ""
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr ""
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr ""
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Aggiungi"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "File pixmap non trovato: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1970,27 -2014,27 +2058,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -1999,74 -2043,74 +2087,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2074,90 -2118,90 +2162,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2184,102 -2228,111 +2276,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/ja.po
index 70d5b4d,1cfeab3..170b3d0
--- a/po/ja.po
+++ b/po/ja.po
@@@ -3,14 -3,16 +3,22 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+ # hirkmt <hirkmt at gmail.com>, 2010,2014
+ # hirkmt <hirkmt at gmail.com>, 2010,2014
# Hironao Komatsu <hironao at users.sourceforge.net>, 2010
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Japanese (http://www.transifex.com/projects/p/deadbeef-player/"
"language/ja/)\n"
"Language: ja\n"
@@@ -19,17 -21,17 +27,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "DeaDBeeF %s ã«ã¤ã„ã¦"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s ã®æ›´æ–°å±¥æ´"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF ã®ç¿»è¨³è€…"
@@@ -86,1007 -88,1056 +94,1072 @@@ msgstr "プリアンプをゼãƒã«
msgid "Zero Bands"
msgstr "ãƒãƒ³ãƒ‰ã‚’ゼãƒã«"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "プリセット"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 æ—¥ %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d æ—¥ %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "åœæ¢ | %d トラック | %s åˆè¨ˆæ¼”å¥æ™‚é–“"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "ãƒãƒ¼ã‚º | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d トラック | %s åˆè¨ˆæ¼”å¥æ™‚é–“"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "æ–°è¦ãƒ—レイリスト"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "æ–°è¦ãƒ—レイリスト (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
- msgstr ""
+ msgstr "タブã®ã¤ã„ãŸãƒ—レイリスト"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "プレイリスト"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
- msgstr ""
+ msgstr "上下分割"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
- msgstr ""
+ msgstr "å·¦å³åˆ†å‰²"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
- msgstr ""
+ msgstr "プレイリストã®ã‚¿ãƒ–"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
- msgstr ""
+ msgstr "é¸æŠžã®ãƒ—ãƒãƒ‘ティ"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
- msgstr ""
+ msgstr "アルãƒãƒ アートã®è¡¨ç¤º"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
- msgstr ""
+ msgstr "スコープ"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
- msgstr ""
+ msgstr "スペクトラム"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
- msgstr ""
+ msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
- msgstr ""
+ msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
+ msgstr "ボタン"
+
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "ヘルプファイルã®èªã¿è¾¼ã¿ä¸ã«å¤±æ•—ã—ã¾ã—ãŸ"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "ヘルプファイルã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
- msgstr ""
+ msgstr "ãã‚Œã§ã‚‚終了ã—ã¾ã™ã‹ï¼Ÿ"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "è¦å‘Š"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "ファイル(_F)"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "ファイルを開ã(_O)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¿½åŠ "
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "ãƒ•ã‚©ãƒ«ãƒ€ã‚’è¿½åŠ "
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "å ´æ‰€ã‚’è¿½åŠ "
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "æ–°è¦ãƒ—レイリスト"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "プレイリストをãƒãƒ¼ãƒ‰"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "プレイリストをä¿å˜"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "終了(_Q)"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "編集(_E)"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "クリア(_C)"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "ã™ã¹ã¦é¸æŠž"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "ã™ã¹ã¦é¸æŠžè§£é™¤"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "é¸æŠžã®å転"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "é¸æŠž"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "å–り除ã"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "é¸æŠžä»¥å¤–ã‚’å–り除ã"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "検索(_F)"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
- msgstr ""
+ msgstr "...ã§ä¸¦ã³æ›¿ãˆ"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "タイトル"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "トラック番å·"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "アルãƒãƒ "
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "アーティスト"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "日付"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "ランダム"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "カスタム"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "è¨å®š"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "表示(_V)"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "ステータスãƒãƒ¼"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "イコライザ"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
- msgstr ""
+ msgstr "デザインモード"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "å†ç”Ÿ(_P)"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "æ¼”å¥é †"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "é †ã«"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "トラックをシャッフル"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "アルãƒãƒ をシャッフル"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "ループ"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
- msgstr ""
+ msgstr "全体をループ"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
- msgstr ""
+ msgstr "å˜ä¸€ã®æ›²ã‚’ループ"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
- msgstr ""
+ msgstr "ループã—ãªã„"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "å†ç”Ÿã«å¾“ã£ã¦ã‚¹ã‚¯ãƒãƒ¼ãƒ«"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "å†ç”Ÿã«å¾“ã£ã¦ã‚«ãƒ¼ã‚½ãƒ«ã‚’移動"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "ç¾åœ¨ã®å†ç”Ÿã®çµ‚了後ã«åœæ¢"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "ç¾åœ¨ã®ãƒˆãƒ©ãƒƒã‚¯ã¸é£›ã¶"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "ヘルプ(_H)"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "æ›´æ–°å±¥æ´(_C)"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "æƒ…å ±(_A)"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "翻訳者(_T)"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "検索"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "åœæ¢"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "å†ç”Ÿ"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "ãƒãƒ¼ã‚º"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "å‰ã¸"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "次ã¸"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "ランダムã«å†ç”Ÿ"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "æƒ…å ±"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "終了"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "ヘルプ"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "トラックã®ãƒ—ãƒãƒ‘ティ"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
- msgstr ""
+ msgstr "å ´æ‰€:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "è¨å®š"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "é©ç”¨(_A)"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "é–‰ã˜ã‚‹(_C)"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "メタデータ"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "プãƒãƒ‘ティ"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "タイトル:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "æ–°è¦ã‚«ãƒ©ãƒ ã®ã‚¿ã‚¤ãƒˆãƒ«ã‚’ã“ã“ã«å…¥åŠ›ã—ã¾ã™"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "å½¢å¼:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "アイテムã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "å†ç”Ÿ"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "アルãƒãƒ アート"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "アーティスト - アルãƒãƒ "
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "æ¼”å¥æ™‚é–“"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "トラック番å·"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "ãƒãƒ³ãƒ‰ / アルãƒãƒ ã®ã‚¢ãƒ¼ãƒ†ã‚£ã‚¹ãƒˆ"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "書å¼:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "é…ç½®:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "å·¦"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "å³"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "ã‚ャンセル(_C)"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "OK(_O)"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "出力プラグイン:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "出力デãƒã‚¤ã‚¹:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
- msgstr "常㫠8 bit オーディオを 16 bit ã«å¤‰æ›ã™ã‚‹"
+ msgstr "8 bit オーディオを常㫠16 bit ã«å¤‰æ›ã™ã‚‹"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
- msgstr ""
+ msgstr "16 bit オーディオを常㫠24 bit ã«å¤‰æ›ã™ã‚‹"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "音声"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "リプレイゲインã®ãƒ¢ãƒ¼ãƒ‰:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "無効"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "トラック"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "リプレイゲインã®ãƒ”ークを調整ã™ã‚‹"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "リプレイゲインã®ãƒ—リアンプ:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "全体ã®ãƒ—リアンプ:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"コマンドライン (ã‚ã‚‹ã„ã¯ãƒ•ã‚¡ã‚¤ãƒ«ãƒžãƒãƒ¼ã‚¸ãƒ£) ã‹ã‚‰ã“ã®ãƒ—レイリストã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’"
"è¿½åŠ "
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "ç«‹ã¡ä¸Šã’時ã«å‰å›žã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’復元ã™ã‚‹"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "ãƒ•ã‚©ãƒ«ãƒ€ã‚’è¿½åŠ ã™ã‚‹ã¨ãアーカイブをå«ã¾ãªã„"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "ç¾åœ¨ã®å†ç”Ÿã®çµ‚了後ã«ãƒªã‚»ãƒƒãƒˆ"
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "å†ç”Ÿ"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "è¨å®š"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP ãƒã‚§ã‚¤ãƒ³ãƒ—リセット"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "ãƒãƒ¼ãƒ‰(_L)"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "ウィンドウを閉ã˜ãŸã¨ãシステムトレイã«æ ¼ç´"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "システムトレイã®ã‚¢ã‚¤ã‚³ãƒ³ã‚’éš ã™"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
- msgid "Enable Russian CP1251 detection and recoding"
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
+ msgid "Enable Russian CP1251 detection and recoding"
+ msgstr "ãƒã‚·ã‚¢èªžã® CP1251 ã®æ¤œå‡ºã¨è¨˜éŒ²ã‚’有効ã«ã™ã‚‹"
+
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
- msgstr ""
+ msgstr "ä¸å›½èªžã® CP936 ã®æ¤œå‡ºã¨è¨˜éŒ²ã‚’有効ã«ã™ã‚‹"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "インタフェースã®æ›´æ–°é »åº¦ (毎秒):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "å†ç”Ÿä¸ã®ã‚¿ã‚¤ãƒˆãƒ«ãƒãƒ¼ã®æ–‡å—列:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "åœæ¢ä¸ã®æ–‡å—列:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "GUI プラグイン (å†ã‚¹ã‚¿ãƒ¼ãƒˆãŒå¿…è¦ã§ã™):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
- msgstr ""
+ msgstr "プレーヤ"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
- msgstr ""
+ msgstr "プレイリストをマウスã®ä¸ãƒœã‚¿ãƒ³ã§é–‰ã˜ã‚‹"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
- msgstr ""
+ msgstr "å†ç”Ÿä¸ã®ãƒˆãƒ©ãƒƒã‚¯ã¯å¤ªå—ã§è¡¨ç¤ºã™ã‚‹"
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "コンテã‚ストメニュー㮠\"ディスクã‹ã‚‰å‰Šé™¤\" ã‚’éš ã™"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
- msgstr "一ã¤ã®ãƒ•ã‚©ãƒ«ãƒ€ã‹ã‚‰è¿½åŠ ã™ã‚‹ã¨ãã¯ãƒ—レイリストã®åå‰ã‚’自動ã§ã¤ã‘ã‚‹"
+ msgstr "å˜ä¸€ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’è¿½åŠ ã™ã‚‹ã¨ãã¯ãƒ—レイリストåを自動ã§ã¤ã‘ã‚‹"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
- msgstr ""
+ msgstr "カラムをウィンドウã«åˆã‚ã›ã¦è‡ªå‹•ãƒªã‚µã‚¤ã‚ºã™ã‚‹"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
- msgstr ""
+ msgstr "GUI/ä»–"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "デフォルトを上書ãã™ã‚‹"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "å‰æ™¯è‰²"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "背景色"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "シークãƒãƒ¼ã¨éŸ³é‡ãƒãƒ¼ã®è‰²"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "ä¸é–“色"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "明色"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "暗色"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "基底色"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "æ–‡å—色"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "タブã®è‰²"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"デフォルトを上書ãã™ã‚‹ (GTKテーマãŒä¸é©ç”¨ã«ãªã‚Šã¾ã™ãŒæç”»ãŒé«˜é€ŸåŒ–ã—ã¾ã™)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "å¶æ•°è¡Œ"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "奇数行"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "é¸æŠžã®è¡Œ"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "é¸æŠžã®æ–‡å—色"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "カーソル"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "プレイリストã®è‰²"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "色"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "プãƒã‚¯ã‚·ã‚µãƒ¼ãƒã‚’有効ã«ã™ã‚‹"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "プãƒã‚¯ã‚·ã‚µãƒ¼ãƒã®ã‚¢ãƒ‰ãƒ¬ã‚¹:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "プãƒã‚¯ã‚·ã‚µãƒ¼ãƒã®ãƒãƒ¼ãƒˆç•ªå·:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "プãƒã‚¯ã‚·ã®å½¢å¼:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "プãƒã‚¯ã‚·ã®ãƒ¦ãƒ¼ã‚¶å:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "プãƒã‚¯ã‚·ã®ãƒ‘スワード:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
- msgstr ""
+ msgstr "HTTP ユーザエージェント:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
- msgstr ""
+ msgstr "コンテントタイプã®å‰²ã‚Šå½“ã¦ã‚’編集ã™ã‚‹"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
- msgstr ""
+ msgstr "割り当ã¦æ¸ˆã¿ã®ãƒ›ãƒƒãƒˆã‚ー:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
- msgstr ""
+ msgstr "動作:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
- msgstr ""
+ msgstr "<未è¨å®š>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
- msgstr ""
+ msgstr "ã‚ーã®çµ„ã¿åˆã‚ã›:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
- msgstr ""
+ msgstr "ã‚°ãƒãƒ¼ãƒãƒ«ãƒ›ãƒƒãƒˆã‚ー"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
"The changes will NOT be saved\n"
"if you don't press Apply."
msgstr ""
+ "é©ç”¨ãƒœã‚¿ãƒ³ã§å¤‰æ›´ã‚’ä¿å˜ã—ã¾ã™ã€‚ã¾ãŸã¯å…ƒã«æˆ»ã™\n"
+ "ボタンã§å¤‰æ›´ã‚’å–り消ã—ã¾ã™ã€‚é©ç”¨ã‚’押ã•ãªã„é™ã‚Š\n"
+ "変更ã¯ä¿å˜ã•ã‚Œã¾ã›ã‚“。"
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
- msgstr ""
+ msgstr "デフォルト(_D)"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
- msgstr ""
+ msgstr "ホットã‚ー"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
- msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³:"
+ msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Copyright"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "プラグイン"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
- msgid "Group By ..."
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+ msgid "Group By ..."
+ msgstr "...ã§ã‚°ãƒ«ãƒ¼ãƒ—化"
+
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
- msgstr ""
+ msgstr "...ã§ä¸¦ã³æ›¿ãˆ"
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "書å¼"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "æ˜‡é †"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "é™é †"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "DSP プラグインã®é¸æŠž"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "プラグイン"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "タグ書ã出ã—ã®è¨å®š"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ID3v2 ã®æ›¸ã出ã—"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ID3v1 ã®æ›¸ã出ã—"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "APEv2 ã®æ›¸ã出ã—"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "ID3v2 ã®é™¤åŽ»"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "ID3v1 ã®é™¤åŽ»"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "APEv2 ã®é™¤åŽ»"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (推奨)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 ã®æ–‡å—エンコーディング (デフォルト㯠iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ID3v2.4 ã®æ›¸ã出ã—"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
- msgstr ""
+ msgstr "コンテントタイプã®å‰²ã‚Šå½“ã¦"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
"plugin, or \"ffmpeg\" plugin."
msgstr ""
+ "ã“ã®è¡¨ã¯ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¹ãƒˆãƒªãƒ¼ãƒ ã®ã‚³ãƒ³ãƒ†ãƒ³ãƒˆã‚¿ã‚¤ãƒ—㨠DeaDBeeF ã®ãƒ‡ã‚³ãƒ¼ãƒ€ãƒ—ラグ"
+ "インã¨ã®å¯¾å¿œã‚’表ã—ã¦ã„ã¾ã™ã€‚例ãˆã°ã€MP3ファイル㯠\"audio/x-mpeg\" ã¨ã„ã†ã‚³ãƒ³"
+ "テントタイプをæŒã¡ã€ãã‚Œã¯DeaDBeeF自身㮠\"stdmpg\" プラグインã‹ã€ã‚ã‚‹ã„㯠"
+ "\"ffmpeg\" プラグインã§ãƒ‡ã‚³ãƒ¼ãƒ‰ã•ã‚Œã¾ã™ã€‚"
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
- msgstr ""
+ msgstr "デフォルトã«æˆ»ã™"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
- msgstr ""
+ msgstr "コンテントタイプ:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
- msgstr ""
+ msgstr "プラグイン:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
- msgstr ""
+ msgstr "ボタンã®ãƒ—ãƒãƒ‘ティ"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
- msgstr ""
+ msgstr "色:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
- msgstr ""
+ msgstr "テã‚スト色:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
- msgstr ""
+ msgstr "アイコン:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
- msgstr ""
+ msgstr "ラベル:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
+ msgstr "動作ã®é¸æŠž"
+
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "アーティスト / アルãƒãƒ "
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "トラック番å·"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "å†ç”Ÿã‚ューã¸è¿½åŠ "
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "å†ç”Ÿã‚ューã‹ã‚‰å‰Šé™¤"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "メタデータをå†èªã¿è¾¼ã¿"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "ディスクã‹ã‚‰å‰Šé™¤"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "カラムã®è¿½åŠ "
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "カラムã®ç·¨é›†"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "カラムã®å‰Šé™¤"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
- msgstr ""
+ msgstr "スクãƒãƒ¼ãƒ«ä¸ã«ã‚°ãƒ«ãƒ¼ãƒ—をピンæ¢ã‚"
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "グループ化"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "ãªã—"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "アーティスト/日付/アルãƒãƒ "
@@@ -1103,19 -1154,19 +1176,19 @@@ msgstr "%s ã®è¨å®š
msgid "Default Audio Device"
msgstr "デフォルトã®éŸ³å£°ãƒ‡ãƒã‚¤ã‚¹"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
- msgstr ""
+ msgstr "ã‚ãªãŸã¯ãƒ›ãƒƒãƒˆã‚ーã®è¨å®šã‚’変更ã—ã¾ã—ãŸãŒã€ä¿å˜ã—ã¦ã„ã¾ã›ã‚“。"
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
- msgstr ""
+ msgstr "ä¿å˜ã›ãšã«ç¶šè¡Œã—ã¾ã™ã‹ï¼Ÿ"
#: ../plugins/gtkui/progress.c:56
msgid "Adding files..."
msgstr "ファイルã®è¿½åŠ ..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "åˆæœŸåŒ–ä¸..."
@@@ -1128,128 -1179,128 +1201,138 @@@ msgid "Really close the window?
msgstr "本当ã«ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã¾ã™ã‹ï¼Ÿ"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[複数ã®å€¤] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "ã‚ー"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "ã‚ー"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "値"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
- msgstr ""
+ msgstr "[複数ã®å€¤]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "ã‚¿ã‚°ã®æ›¸ã出ã—ä¸..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
- msgstr ""
+ msgstr "フィールドå"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "åå‰:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "フィールド㯠: ã‚„ _ ã§å§‹ã¾ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’è¿½åŠ ã§ãã¾ã›ã‚“"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "åŒã˜åå‰ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ãŒã‚ã‚Šã¾ã™ã€‚別ã®åå‰ã§è©¦ã—ã¦ãã ã•ã„。"
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’è¿½åŠ "
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "フィールドを削除"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "使ã„æ–¹: deadbeef [オプション] [--] [ファイル...]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "オプション:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help or -h ヘルプ (ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸) を表示ã—ã¦çµ‚了\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit プレイヤを終了ã™ã‚‹\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’è¡¨ç¤ºã—ã¦çµ‚了\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play å†ç”Ÿã‚’開始ã™ã‚‹\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop å†ç”Ÿã‚’åœæ¢ã™ã‚‹\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause ãƒãƒ¼ã‚ºã™ã‚‹\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause ãƒãƒ¼ã‚ºã®ãƒˆã‚°ãƒ«\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr " --play-pause åœæ¢ä¸ãªã‚‰å†ç”Ÿé–‹å§‹ã—ã€ã§ãªã‘ã‚Œã°ãƒãƒ¼ã‚ºã—ã¾ã™\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next プレイリストã®æ¬¡ã®æ›²ã¸\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev プレイリストã®å‰ã®æ›²ã¸\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random プレイリストã‹ã‚‰ãƒ©ãƒ³ãƒ€ãƒ ã«é¸ã‚“ã 曲ã¸\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue ファイルを既å˜ã®ãƒ—レイリストã«è¿½åŠ ã™ã‚‹\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
@@@ -1257,12 -1308,12 +1340,12 @@@ msgstr "
" --gui PLUGIN 使用ã™ã‚‹ GUI プラグインを指定ã—ã¾ã™ã€‚デフォルト㯠"
"\"GTK2\"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying æ›¸å¼ æ›¸å¼åŒ–ã•ã‚ŒãŸãƒˆãƒ©ãƒƒã‚¯åã‚’ stdout ã«æ›¸ã出ã—ã¾ã™\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1274,7 -1325,7 +1357,7 @@@ msgstr "
" é•·ã•[l], トラック番å·[n], å¹´[y], コメント[c],\n"
" 著作権[r], 経éŽæ™‚é–“[e]\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1283,28 -1334,24 +1366,36 @@@ msgstr "
" 例: --nowplaying \"%%a - %%t\" 㯠\"アーティスト - タイ"
"トル\" ã¨è¡¨ç¤ºã—ã¾ã™\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " 詳ã—ãã¯ã“ã¡ã‚‰: http://sourceforge.net/apps/mediawiki/"
- "deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "デフォルト"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "ã¯ã„"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "デフォルト"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "ã¯ã„"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "ã„ã„ãˆ"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1330,7 -1377,7 +1421,7 @@@ msgstr "
"ãƒãƒ³ãƒ‰ / アルãƒãƒ ã®ã‚¢ãƒ¼ãƒ†ã‚£ã‚¹ãƒˆ\n"
"カスタム"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1338,7 -1385,7 +1429,7 @@@ msgstr "
"å·¦\n"
"å³"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1348,7 -1395,7 +1439,7 @@@ msgstr "
"トラック\n"
"アルãƒãƒ "
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1356,7 -1403,7 +1447,7 @@@ msgstr "
"æ˜‡é †\n"
"é™é †"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1364,14 -1411,7 +1455,7 @@@ msgstr "
"2.3 (推奨)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Pixmap ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1384,7 -1424,7 +1468,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1431,7 -1471,7 +1515,7 @@@ msgstr "Scrobble URL
#: ../translation/extra.c:16
msgid "Prefer Album Artist over Artist field"
- msgstr ""
+ msgstr "アーティストã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚ˆã‚Šã‚¢ãƒ«ãƒãƒ ã®ã‚¢ãƒ¼ãƒ†ã‚£ã‚¹ãƒˆã‚’優先ã™ã‚‹"
#. OSS output plugin
#: ../translation/extra.c:18
@@@ -1503,7 -1543,7 +1587,7 @@@ msgstr "リサンプリングをå“質
#: ../translation/extra.c:37
msgid "8-bit output (default is 16)"
- msgstr ""
+ msgstr "8-bit 出力 (デフォルト㯠16)"
#. Game_Music_Emu decoder plugin
#: ../translation/extra.c:39
@@@ -1512,7 -1552,7 +1596,7 @@@ msgstr "最大ã®æ›²é•· (分)
#: ../translation/extra.c:40
msgid "Fadeout length (seconds)"
- msgstr ""
+ msgstr "フェードアウトã®é•·ã• (秒)"
#: ../translation/extra.c:41
msgid "Play loops nr. of times (if available)"
@@@ -1669,7 -1709,7 +1753,7 @@@ msgstr "サンプルレートã®æŒ‡å®š
#: ../translation/extra.c:94
msgid "Quality / Algorithm"
- msgstr ""
+ msgstr "音質 / アルゴリズム"
#: ../translation/extra.c:95
msgid "Automatic Samplerate (overrides Target Samplerate)"
@@@ -1677,13 -1717,13 +1761,13 @@@ msgstr "サンプルレートã®è‡ªå‹•è
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
#: ../translation/extra.c:99
msgid "Disable gapless playback (faster scanning)"
- msgstr ""
+ msgstr "ギャップレスå†ç”Ÿã‚’無効ã«ã™ã‚‹ (スã‚ャンãŒæ—©ããªã‚Šã¾ã™)"
#. adplug
#: ../translation/extra.c:101
@@@ -1692,114 -1732,119 +1776,119 @@@ msgstr "
#: ../translation/extra.c:102
msgid "Enable surround"
+ msgstr "サラウンドを有効ã«ã™ã‚‹"
+
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "ãã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚上書ãã—ã¾ã™ã‹ï¼Ÿ"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "コンãƒãƒ¼ã‚¿ã®è¦å‘Š"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "エンコーダをé¸æŠžã—ã¦ãã ã•ã„"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "変æ›ã‚¨ãƒ©ãƒ¼"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "変æ›ä¸..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "フォルダã®é¸æŠž..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "エンコーダã®ãƒ—リセットã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸ"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
"フォルダã®ãƒ‘ーミッションã€åå‰ã®é‡è¤‡ã€ãƒ‡ã‚£ã‚¹ã‚¯ã®ç©ºã容é‡ã‚’確èªã—ã¦ãã ã•ã„"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "åŒã˜åå‰ã®ãƒ—リセットãŒæ—¢ã«ã‚ã‚Šã¾ã™ã€‚別ã®åå‰ã§è©¦ã—ã¦ãã ã•ã„。"
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "エラー"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "æ–°è¦ã‚¨ãƒ³ã‚³ãƒ¼ãƒ€ã®è¿½åŠ "
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "エンコーダã®ç·¨é›†"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "プリセットã®å‰Šé™¤"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "é¸æŠžä¸ã®ãƒ—リセットを削除ã—ã¾ã™ã€‚続ã‘ã¾ã™ã‹ï¼Ÿ"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "エンコーダ"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "プラグインを DSP ãƒã‚§ã‚¤ãƒ³ã«è¿½åŠ "
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "DSP プリセットã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸ"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "æ–°è¦ã® DSP プリセット"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "DSP プリセットã®ç·¨é›†"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP プリセット"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "出力先フォルダ:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "å…ƒã®ãƒˆãƒ©ãƒƒã‚¯ã¨åŒã˜ãƒ•ã‚©ãƒ«ãƒ€ã«æ›¸ã"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "ãƒ•ã‚©ãƒ«ãƒ€æ§‹é€ ã‚’ä¿å˜ã™ã‚‹"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "出力ファイルå:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1809,89 -1854,89 +1898,89 @@@ msgstr "
"æ‹¡å¼µå (.mp3ãªã©) ã¯è‡ªå‹•ã§è¿½åŠ ã•ã‚Œã¾ã™ã€‚\n"
"ã“ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’空ã«ã™ã‚‹ã¨ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚’使ã„ã¾ã™ (%a - %t)。"
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "エンコーダ:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP ã®ãƒ—リセット:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "スレッドã®æ•°:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "出力ã®ã‚µãƒ³ãƒ—ルã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "å…ƒã®ã¾ã¾ã«ã™ã‚‹"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 bit 符å·ã¤ãæ•´æ•°"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 bit 符å·ã¤ãæ•´æ•°"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 bit 符å·ã¤ãæ•´æ•°"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 bit 符å·ã¤ãæ•´æ•°"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 bit 浮動å°æ•°ç‚¹æ•°"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "ファイルãŒå˜åœ¨ã™ã‚‹ã¨ã:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "å°‹ãã‚‹"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "上書ãã™ã‚‹"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "エンコーダã®ãƒ—リセットè¨å®š"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "ç„¡é¡Œã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ€"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "出力ファイルã®æ‹¡å¼µå:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "例: mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "コマンドライン:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1901,7 -1946,7 +1990,7 @@@ msgstr "
"例: lame - %o\n"
"%i: 入力ファイル, %o: 出力ファイル, -: 標準入力"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1911,66 -1956,72 +2000,72 @@@ msgstr "
"<small>%o - 出力先ã®ãƒ•ã‚¡ã‚¤ãƒ«å\n"
"%i - 入力ã®ä¸€æ™‚ファイルå</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "経由ã™ã‚‹:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "パイプ"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "一時ファイル"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>タグ書ã出ã—</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "DSP プリセットエディタ"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "無題㮠DSP プリセット"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "è¿½åŠ "
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Pixmap ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2006,29 -2057,29 +2101,29 @@@ msgstr "
#: ../plugins/shellexecui/interface.c:46
#: ../plugins/shellexecui/shellexec.glade.h:1
msgid "Custom Shell Commands"
- msgstr "シェルã®ã‚³ãƒžãƒ³ãƒ‰"
+ msgstr "シェルコマンドã®è¨å®š"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "編集"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "é–‰ã˜ã‚‹"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "コマンドã®ç·¨é›†"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "コマンド:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2039,17 -2090,17 +2134,17 @@@ msgstr "
"ä»»æ„ã®ã‚·ã‚§ãƒ«ã®ã‚³ãƒžãƒ³ãƒ‰ã€‚アプリケーションを立ã¡ä¸Šã’ãŸã‚·ã‚§ãƒ«ã®ã‚³ãƒ³ãƒ†ã‚ストã‹ã‚‰"
"実行ã•ã‚Œã¾ã™ã€‚xdg-open %D ã®ã‚ˆã†ãªæ›¸å¼ãŒä½¿ãˆã¾ã™"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "ID:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "\"My Shell Command\" ã®ã‚ˆã†ãªè‡ªç”±ãªå½¢å¼ã®åå‰"
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
@@@ -2057,158 -2108,163 +2152,167 @@@
msgstr ""
"コマンド ID (\"youtube_open\" ã®ã‚ˆã†ãªçŸã„è˜åˆ¥å)。一æ„ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "å˜ä¸€ãƒˆãƒ©ãƒƒã‚¯"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "å˜ä¸€ã®ãƒˆãƒ©ãƒƒã‚¯ã«å¯¾ã—ã¦å‹•ä½œã—ã¾ã™"
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "複数トラック"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "複数ã®ãƒˆãƒ©ãƒƒã‚¯ã«å¯¾ã—ã¦å‹•ä½œã—ã¾ã™"
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "ãƒãƒ¼ã‚«ãƒ«"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "ãƒãƒ¼ã‚«ãƒ«ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦å‹•ä½œã—ã¾ã™"
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "リモート"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "リモートã®ãƒ•ã‚¡ã‚¤ãƒ« (http:// ストリームãªã©) ã«å¯¾ã—ã¦å‹•ä½œã—ã¾ã™"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
- msgstr ""
+ msgstr "一般 (メインメニュー)"
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "アイテムã¯ãƒ¡ã‚¤ãƒ³ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã«ç¾ã‚Œã¾ã™"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
"contains the menu path like this: \"File/My Command\", where File is the "
"menu name in the English version.</small>"
msgstr ""
+ "<small>メインメニューã«ã‚³ãƒžãƒ³ãƒ‰ã‚’è¿½åŠ ã—ãŸã„å ´åˆã€ãã®ã‚¿ã‚¤ãƒˆãƒ«ãŒãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒ‘スを"
+ "以下ã®ã‚ˆã†ã«å«ã‚“ã§ã„ã‚‹ã“ã¨ã‚’確ã‹ã‚ã¦ãã ã•ã„: \"File/My Command\", ã“ã“ã§ãƒ¡"
+ "ニューå File ã¯è‹±èªžç‰ˆã§ã®ã‚‚ã®ã§ã™ã€‚</small>"
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "コマンドã®è¿½åŠ "
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "削除"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr "é¸æŠžä¸ã®ã‚·ã‚§ãƒ«ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’削除ã—ã¾ã™ã€‚続ã‘ã¾ã™ã‹ï¼Ÿ"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "削除ã®ç¢ºèª"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "IDã¯ç©ºã§ãªãã€ä¸€æ„ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "タイトルã¯ç©ºã«ã§ãã¾ã›ã‚“\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "シェルã®ã‚³ãƒžãƒ³ãƒ‰ã¯ç©ºã«ã§ãã¾ã›ã‚“\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "ä¸æ£ãªå€¤"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
- msgstr ""
+ msgstr "サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„る音声フォーマット"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
- msgstr ""
+ msgstr "ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ« (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
- msgstr ""
+ msgstr "ファイルを開ã..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
- msgstr ""
+ msgstr "プレイリストã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¿½åŠ ..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
- msgstr ""
+ msgstr "プレイリストã«ãƒ•ã‚©ãƒ«ãƒ€ã‚’è¿½åŠ ..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
- msgstr ""
+ msgstr "シンボリックリンクを追跡ã™ã‚‹"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
- msgstr ""
+ msgstr "help.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
- msgstr ""
+ msgstr "ファイルをディスクã‹ã‚‰å‰Šé™¤ã™ã‚‹"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
+ "ファイルã¯å¤±ã‚ã‚Œã¾ã™ã€‚続ã‘ã¾ã™ã‹ï¼Ÿ\n"
+ "(ã“ã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã¯ GTKUI プラグインã®è¨å®šã§éžè¡¨ç¤ºã«ã§ãã¾ã™)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
- msgstr ""
+ msgstr "プレイリストã®ãƒãƒ¼ãƒ‰"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
- msgstr ""
+ msgstr "ãã®ä»–ã®ãƒ•ã‚¡ã‚¤ãƒ« (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
- msgstr ""
+ msgstr "プレイリストã«åå‰ã‚’付ã‘ã¦ä¿å˜"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
- msgstr ""
+ msgstr "DeaDBeeF プレイリストファイル (*.dbpl)"
#: ../plugins/gtkui/ctmapping.c:129
msgid "Content-Type"
- msgstr ""
+ msgstr "コンテントタイプ"
#: ../plugins/gtkui/ctmapping.c:199
msgid "Invalid value(s)."
- msgstr ""
+ msgstr "ä¸æ£ãªå€¤ã§ã™ã€‚"
#: ../plugins/gtkui/ctmapping.c:200
msgid ""
@@@ -2220,107 -2276,123 +2324,203 @@@
"Content type should be only letters, numbers and '-' sign.\n"
"Plugin id can contain only letters and numbers."
msgstr ""
+ "コンテントタイプã¨ãƒ—ラグインã®ãƒ•ã‚£ãƒ¼ãƒ«ã¨ã¯ç©ºã«ã¯ã§ãã¾ã›ã‚“。\n"
+ "ãã—ã¦ä»¥ä¸‹ã®ãƒ«ãƒ¼ãƒ«ã«å¾“ã£ã¦ãã ã•ã„。\n"
+ "コンテントタイプã®ä¾‹: 'audio/mpeg'\n"
+ "プラグイン ID ã®ä¾‹: 'stdmpg ffmpeg'\n"
+ "プラグイン ID ã®ãƒªã‚¹ãƒˆã¯ã‚¹ãƒšãƒ¼ã‚¹ã§åŒºåˆ‡ã‚Šã¨ã—ã¾ã™ã€‚\n"
+ "コンテントタイプã¯æ–‡å—ã€æ•°å—ã€ã¾ãŸ '-' 記å·ã§æ§‹æˆã•ã‚Œã¾ã™ã€‚\n"
+ "プラグイン ID ã¯æ–‡å—ã¨æ•°å—ã ã‘ã‹ã‚‰ãªã‚Šã¾ã™ã€‚"
#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
msgid "Nothing is selected."
+ msgstr "é¸æŠžãŒã‚ã‚Šã¾ã›ã‚“。"
+
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
++=======
+ #: ../plugins/gtkui/widgets.c:772
++>>>>>>> upstream/0.6.2
msgid "Replace with..."
- msgstr ""
+ msgstr "...ã§ç½®ãæ›ãˆã‚‹"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:599
++=======
+ #: ../plugins/gtkui/widgets.c:777
++>>>>>>> upstream/0.6.2
msgid "Insert..."
- msgstr ""
+ msgstr "...を挿入ã™ã‚‹"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:626
++=======
+ #: ../plugins/gtkui/widgets.c:804
++>>>>>>> upstream/0.6.2
msgid "Cut"
- msgstr ""
+ msgstr "カット"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:633
++=======
+ #: ../plugins/gtkui/widgets.c:811
++>>>>>>> upstream/0.6.2
msgid "Copy"
- msgstr ""
+ msgstr "コピー"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:640
++=======
+ #: ../plugins/gtkui/widgets.c:818
++>>>>>>> upstream/0.6.2
msgid "Paste"
- msgstr ""
+ msgstr "ペースト"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:764
++=======
+ #: ../plugins/gtkui/widgets.c:942
++>>>>>>> upstream/0.6.2
msgid "Multiple widgets of this type are not supported"
- msgstr ""
+ msgstr "ã“ã®ã‚¿ã‚¤ãƒ—ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã‚’複数利用ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1071
++=======
+ #: ../plugins/gtkui/widgets.c:1249
++>>>>>>> upstream/0.6.2
msgid "Lock movement"
- msgstr ""
+ msgstr "固定ã™ã‚‹"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1356
++=======
+ #: ../plugins/gtkui/widgets.c:1534
++>>>>>>> upstream/0.6.2
msgid "Move tab left"
- msgstr ""
+ msgstr "タブを左ã«ç§»å‹•"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1363
++=======
+ #: ../plugins/gtkui/widgets.c:1541
++>>>>>>> upstream/0.6.2
msgid "Move tab right"
- msgstr ""
+ msgstr "タブをå³ã«ç§»å‹•"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1370
++=======
+ #: ../plugins/gtkui/widgets.c:1548
++>>>>>>> upstream/0.6.2
msgid "Remove tab"
- msgstr ""
+ msgstr "タブã®å‰Šé™¤"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1377
++=======
+ #: ../plugins/gtkui/widgets.c:1555
++>>>>>>> upstream/0.6.2
msgid "Rename tab"
- msgstr ""
+ msgstr "タブã®åå‰å¤‰æ›´"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1438
++=======
+ #: ../plugins/gtkui/widgets.c:1616
++>>>>>>> upstream/0.6.2
msgid "Add new tab"
- msgstr ""
+ msgstr "æ–°è¦ã‚¿ãƒ–ã®è¿½åŠ "
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1861
++=======
+ #: ../plugins/gtkui/widgets.c:2036
++>>>>>>> upstream/0.6.2
msgid "Show Column Headers"
- msgstr ""
+ msgstr "カラムヘッダã®è¡¨ç¤º"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:2969
++=======
+ #: ../plugins/gtkui/widgets.c:3147
++>>>>>>> upstream/0.6.2
msgid "Expand the box by 1 item"
- msgstr ""
+ msgstr "ボックスを 1 アイテム分広ã’ã‚‹"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:2974
++=======
+ #: ../plugins/gtkui/widgets.c:3152
++>>>>>>> upstream/0.6.2
msgid "Shrink the box by 1 item"
- msgstr ""
+ msgstr "ボックスを 1 アイテム分縮ã‚ã‚‹"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:2979
++=======
+ #: ../plugins/gtkui/widgets.c:3157
++>>>>>>> upstream/0.6.2
msgid "Homogeneous"
- msgstr ""
+ msgstr "大ãã•ã‚’æƒãˆã‚‹"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3019
++=======
+ #: ../plugins/gtkui/widgets.c:3197
++>>>>>>> upstream/0.6.2
msgid "Expand"
- msgstr ""
+ msgstr "広ã’ã‚‹"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3027
++=======
+ #: ../plugins/gtkui/widgets.c:3205
++>>>>>>> upstream/0.6.2
msgid "Fill"
- msgstr ""
+ msgstr "余白を埋ã‚ã‚‹"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
+ msgstr "è¨å®šãƒœã‚¿ãƒ³"
+
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
msgstr ""
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
- msgstr ""
+ msgstr "プレイリストã®ç·¨é›†"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
- msgstr ""
+ msgstr "プレイリストã®åå‰å¤‰æ›´"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
- msgstr ""
+ msgstr "プレイリストã®é™¤åŽ»"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
- msgstr ""
+ msgstr "æ–°è¦ãƒ—レイリストã®è¿½åŠ "
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
- msgstr ""
+ msgstr "åå‰"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
++<<<<<<< HEAD
+msgstr ""
++=======
+ msgstr "プレイリストブラウザ"
++>>>>>>> upstream/0.6.2
diff --combined po/kk.po
index 4811b39,7392ef0..4983599
--- a/po/kk.po
+++ b/po/kk.po
@@@ -3,14 -3,14 +3,20 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
- # Baurzhan Muftakhidinov <baurthefirst at gmail.com>, 2010,2013
+ # Baurzhan Muftakhidinov <baurthefirst at gmail.com>, 2010,2013-2014
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Kazakh (http://www.transifex.com/projects/p/deadbeef-player/"
"language/kk/)\n"
"Language: kk\n"
@@@ -19,17 -19,17 +25,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "DeaDBeeF %s туралы"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s өзгеріÑтері"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF аудармашылары"
@@@ -86,916 -86,950 +92,962 @@@ msgstr "Ðлдын-ала күшейтÑ
msgid "Zero Bands"
msgstr "Жиіліктерді нөлдеу"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Сақталған баптаулар"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 күн %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d күн %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Тоқтатылған | %d трек | %s жалпы уақыты"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Моно"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Моно"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Стерео"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d кбит/Ñ "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "ÐÑлдатылған | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr "%s%s %s| %dГц | %d бит | %s | %d:%02d / %s | %d трек | %s жалпы уақыты"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Жаңа ойнату тізімі"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Жаңа ойнату тізімі (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Беттері бар ойнату тізімі"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Ойнату тізімі"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "Ðжыратқыш (жоғары және төмен)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "Ðжыратқыш (Ñол және оң жақ)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Ойнату тізім беттері"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Таңдалғанның қаÑиеттері"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Ðльбом мұқабаÑын көрÑету"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "Scope"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "Спектралды талдағыш"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Батырма"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Көмек файлын оқу ÑәтÑіз"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Көмек файлын жүктеу ÑәтÑіз"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- "Плеер ағымдағы уақытта бірнеше фон тапÑырмаларын орындап жатыр. Қазір "
- "жұмыÑын аÑқтаÑаңыз, ол тапÑырмалардан Ð±Ð°Ñ Ñ‚Ð°Ñ€Ñ‚Ñ‹Ð»Ð°Ð´Ñ‹, немеÑе олар үзіледі. "
- "Бұл деректер жоғалуына әкеп Ñоғуы мүмкін."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "Шығуды шынымен қалайÑыз ба?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "ЕÑкерту"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Файл"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "Ф_айл(дар)ды ашу"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Файл(дар)ды қоÑу"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Бума(лар)ды қоÑу"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "ОрналаÑуы бойынша қоÑу"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Жаңа ойнату тізімі"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Ойнату тізімін жүктеу"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Ойнату тізімін Ñақтау"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Шығу"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "Тү_зету"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "Та_зарту"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Барлығын таңдау"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Таңдауды алып таÑтау"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Таңдауды теріÑтеу"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Таңдалған"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Өшіру"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Одан баÑқаÑын өшіру"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "Ізд_еу"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Қалайша Ñұрыптау"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Ðтауы"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Трек нөмірі"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Ðльбом"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "ӘртіÑ"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Күні"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "КездейÑоқ"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Таңдауыңызша"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Баптаулар"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Түрі"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Қалып-күй жолағы"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ðквалайзер"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "Дизайн режимі"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "О_йнату"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Реті"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Қалыпты"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Тректерді аралаÑтыру"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Ðльбомдарды аралаÑтыру"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Қайталау"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Барлығын қайталау"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Бір тректі қайталау"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Қайталамау"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Ðғымдағы трек атын айналдыру"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Ðғымдағы тректі ерекшелеу"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "ÐғымдағыÑынан кейін тоқтату"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Ðғымдағы трекке өту"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Көмек"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "Өз_геріÑтер"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "О_ÑÑ‹ туралы"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "Ðу_дармашылар"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Іздеу"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Тоқтату"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Ойнату"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "ÐÑлдату"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Ðлдыңғы"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "КелеÑÑ–"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "КездейÑоқты ойнату"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "ОÑÑ‹ туралы"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Шығу"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Көмек"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Трек қаÑиеттері"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "ОрналаÑуы:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Баптаулар"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "ІÑ_ке аÑыру"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Жабу"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Метаақпарат"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "ҚаÑиеттері"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Ðтауы:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Жаңа баған атауын оÑында енгіңіз"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Түрі:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Реттік нөмірі"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Ойналуда"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Ðльбом Ñуреті"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Ó˜Ñ€Ñ‚Ñ–Ñ - Ðльбом"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Ұзақтығы"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Трек нөмірі"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Топ / Ðльбом әртіÑÑ–"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Пішімі:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Туралауы:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Сол жақ"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Оң жақ"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "Ба_Ñ Ñ‚Ð°Ñ€Ñ‚Ñƒ"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_ОК"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Ð¨Ñ‹Ò“Ñ‹Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Ð¨Ñ‹Ò“Ñ‹Ñ Ò›Ò±Ñ€Ñ‹Ð»Ò“Ñ‹:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "8 биттік аудионы әрқашан 16 биттіке түрлендіру"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr "16 биттік аудионы әрқашан 24 биттіке түрлендіру"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "ДыбыÑ"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Ð”Ñ‹Ð±Ñ‹Ñ Ò›Ð°Ñ‚Ñ‚Ñ‹Ð»Ñ‹Ò“Ñ‹Ð½ авто түзету:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Сөндірулі"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Трек"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Пиктік мәнін қолдану"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 дБ"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 дБ"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Ð”Ñ‹Ð±Ñ‹Ñ Ò›Ð°Ñ‚Ñ‚Ñ‹Ð»Ñ‹Ò“Ñ‹Ð½ автотүзетудің алдын-ала күшейтілуі:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Ð”Ñ‹Ð±Ñ‹Ñ Ò›Ð°Ñ‚Ñ‚Ñ‹Ð»Ñ‹Ò“Ñ‹Ð½ жалпы алдын-ала күшейту:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Бұл ойнату тізіміне файлдарды командалық жолдан (не файлдар баÑқарушыÑынан) "
"қоÑу:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "ҚоÑылғанда, Ñоңғы ÑеÑÑиÑны жалғаÑтыру"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Бумаларды қоÑқан кезде архивтерден қоÑпау"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "\"ÐғымдағыÑынан кейін тоқтатуды\" автотаÑтау"
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Ойнату үрдіÑÑ–"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Баптау"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP тізбегінің баптауы"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "Жү_ктеу"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Жабу орнына трейге орналаÑтыру"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Жүйелік Ñөре таңбашаÑын жаÑыру"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "ÐžÑ€Ñ‹Ñ CP1251 кодталуын анықтауды және қайта кодтауды Ñ–Ñке қоÑу"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Қытайша CP936 кодталуын анықтауды және қайта кодтауды Ñ–Ñке қоÑу"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "ИнтерфейÑÑ‚Ñ– жаңарту жиілігі (Ñекундына рет)"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Ойнатылған кездегі атау мәтіні:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Тоқтатылған кездегі атау мәтіні:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "GUI плагині (ауыÑтырылÑа, қайта қоÑу керек):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
- msgstr ""
+ msgstr "Плеер"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
- msgstr ""
+ msgstr "Ойнату тізімдерін тышқанның орта батырмаÑымен жабу"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
- msgstr ""
+ msgstr "Ойнатылып жатқан тректі жуан қаріппен көрÑету"
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "\"Қатты диÑктен өшіру\" нұÑқаÑын контекÑÑ‚ мәзірінде көрÑетпеу"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Бірлік буманы қоÑқан кезде ойнату тізімін автоатау"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
- msgstr ""
+ msgstr "Бағандар өлшемдерін терезеге ÑÑ‹Ñтындай автоөзгерту"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "ИнтерфейÑ/түрлі"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "ÐлмаÑтыру"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Ðлдыңғы көрініÑÑ–"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Фон"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "ҮрдіÑ/Ð´Ñ‹Ð±Ñ‹Ñ Ð¶Ð¾Ð»Ð°Ò›Ñ‚Ð°Ñ€Ñ‹Ð½Ñ‹Ò£ Ñ‚Ò¯Ñтері"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "ОртаÑÑ‹"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Ðшық Ñ‚Ò¯ÑÑ‚Ñ–"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Күңгірт"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Ðегізгі"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Мәтін"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Беттер"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "ÐлмаÑтыру (GTK темаÑының баптаулары жоғалады, бірақ жылдамдығы артады)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Жұп жол"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Тақ жол"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Ерекшеленген жол"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Ерекшеленген мәтін"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "КурÑор"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Ойнату тізім Ñ‚Ò¯Ñтері"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "ТүÑтер"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "ПрокÑи Ñерверді Ñ–Ñке қоÑу"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "ПрокÑи Ñервер адреÑÑ–:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "ПрокÑи Ñервер порты:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "ПрокÑи түрі:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "ПрокÑи пайдаланушыÑÑ‹:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "ПрокÑи паролі:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "HTTP User Agent:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "Content-Type ÑәйкеÑтіктерін түзету"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Желі"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr "Тағайындалған Ñ‹ÑÑ‚Ñ‹Ò› пернелер:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr "Әрекет:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<Орнатылмаған>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr "Пернелер комбинациÑÑÑ‹:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Глобалды Ñ‹ÑÑ‚Ñ‹Ò› перне"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
"The changes will NOT be saved\n"
"if you don't press Apply."
msgstr ""
+ "ӨзгеріÑтерді Ñақтау үшін ІÑке аÑыру, ал, оларды\n"
+ "болдырмау үшін Қайтару батырмаÑын қолданыңыз.\n"
+ "ІÑке аÑыру батырмаÑын баÑпаÑаңыз,\n"
+ "өзгеріÑтер Ñақталмайды."
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
- msgstr ""
+ msgstr "_БаÑтапқы"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "ЫÑÑ‚Ñ‹Ò› пернелер"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "ÐÒ±ÑқаÑÑ‹:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Copyright"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Плагиндер"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "Қалайша топтау ..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "Қалайша Ñұрыптау ..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Пішімі"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Ó¨Ñу ретімен"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Кему ретімен"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "DSP плагинін таңдау"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Плагин"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Тег жазушыÑÑ‹ баптаулары"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ID3v2 жазу"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ID3v1 жазу"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "APEv2 жазу"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "ID3v2 алып таÑтау"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "ID3v1 алып таÑтау"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "APEv2 алып таÑтау"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 нұÑқаÑÑ‹"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Ò°Ñынылады)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 таңбалар кодталуы (баÑтапқыÑÑ‹ iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ID3v2.4 жазу"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "Content-Type ÑәйкеÑтіктері"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1007,91 -1041,100 +1059,104 @@@ msgstr "
"\"audio/x-mpeg\" болады, және оны DeaDBeeF-тің өздік \"stdmpg\" плагині, не "
"\"ffmpeg\" плагині декодтауы керек."
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "БаÑтапқы мәндеріне таÑтау"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "Content-Type:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "Плагиндер:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr "Батырма қаÑиеттері"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr "ТүÑÑ–:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr "Мәтін Ñ‚Ò¯ÑÑ–:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr "Таңбаша:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr "Белгі:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr "Әрекетті таңдаңыз"
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Ó˜Ñ€Ñ‚Ñ–Ñ / Ðльбом"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Трек №"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Ойнату кезегіне қоÑу"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Ойнату кезегінен өшіру"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Метаақпаратты қайта жүктеп алу"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "ДиÑкіден өшіру"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Бағанды қоÑу"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Бағанды түзету"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Бағанды өшіру"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
- msgstr ""
+ msgstr "Ðйналдыру кезінде топтарды бекіту"
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Қалайша топтау"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "ЕшнәрÑе"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "ӘртіÑ/Күні/Ðльбом"
@@@ -1108,19 -1151,20 +1173,20 @@@ msgstr "%s баптау
msgid "Default Audio Device"
msgstr "Ðегізгі Ð´Ñ‹Ð±Ñ‹Ñ Ò›Ò±Ñ€Ñ‹Ð»Ò“Ñ‹ÑÑ‹"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
+ "Сіз Ñ‹ÑÑ‚Ñ‹Ò› перне жарлығын өзгерттіңіз, бірақ, өзгеріÑтерді Ñақтаған жоқÑыз."
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
- msgstr ""
+ msgstr "Сақтамай-ақ жалғаÑтыруды қалайÑыз ба?"
#: ../plugins/gtkui/progress.c:56
msgid "Adding files..."
msgstr "Файлдарды қоÑу..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "ІÑке қоÑылуда..."
@@@ -1133,129 -1177,129 +1199,139 @@@ msgid "Really close the window?
msgstr "Терезені шынымен жабу керек пе?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Бірнеше мәндер] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Кілт"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Кілт"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Мәні"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[Бірнеше мәндер] "
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Тегтерді жазу..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Ó¨Ñ€Ñ–Ñ Ð°Ñ‚Ð°ÑƒÑ‹"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "ÐÑ‚Ñ‹:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Ó¨Ñ€Ñ–Ñ Ð°Ñ‚Ð°ÑƒÑ‹ : не _ таңбаларынан баÑталмауы тиіÑ"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "ӨріÑÑ‚Ñ– қоÑу мүмкін емеÑ"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Ондай атымен Ó©Ñ€Ñ–Ñ Ð±Ð°Ñ€ болып тұр, баÑқа атауын көрÑетіңіз."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "ӨріÑÑ‚Ñ– қоÑу"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "ӨріÑÑ‚Ñ– өшіру"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "Қолданылуы: deadbeef [опциÑлар] [файл(дар)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "ОпциÑлары:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help не -h Көмек ақпаратын (оÑÑ‹) шығару мен шығу\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Плеерді жабу\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version ÐÒ±Ñқа ақпаратын шығару мен шығу\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Ойнатуды баÑтау\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Ойнатуды тоқтату\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Ойнатуды аÑлдату\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Паузаны ауыÑтыру\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
" --play-pause Тоқтатылған болÑа, ойнату, болмаÑа, паузаны ауыÑтыру\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Ойнату тізіміндегі келеÑÑ– трек\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Ойнату тізіміндегі алдыңғы трек\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Ойнату тізіміндегі кездейÑоқ трек\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Файл(дар)ды бар ойнату тізіміне қоÑу\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
@@@ -1263,12 -1307,12 +1339,12 @@@ msgstr "
" --gui PLUGIN Қолданылатын GUI плагинін көрÑетеді. БаÑтапқыÑÑ‹ "
"\"GTK2\"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying ПШМ ШығыÑқа пішімделген трек атын шығару\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1279,7 -1323,7 +1355,7 @@@ msgstr "
" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
" copy[r]ight, [e]lapsed\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1288,28 -1332,24 +1364,36 @@@ msgstr "
" мыÑ.: --nowplaying \"%%a - %%t\" Ñкранға \"artist - "
"title\" шығаруы тиіÑ\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " көбірек білу үшін, http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting қараңыз\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "БаÑтапқы"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Иә"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "БаÑтапқы"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Иә"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Жоқ"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1335,7 -1375,7 +1419,7 @@@ msgstr "
"Топ / Ðльбом әртіÑÑ–\n"
"Таңдауыңызша"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1343,7 -1383,7 +1427,7 @@@ msgstr "
"Сол жақ\n"
"Оң жақ"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1353,7 -1393,7 +1437,7 @@@ msgstr "
"Трек\n"
"Ðльбом"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1361,7 -1401,7 +1445,7 @@@ msgstr "
"Ó¨Ñу ретімен\n"
"Кему ретімен"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1369,14 -1409,7 +1453,7 @@@ msgstr "
"2.3 (Ò°Ñынылады)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Сурет файлын табу мүмкін емеÑ: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1389,8 -1422,8 +1466,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "Ðудио CD қоÑу"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1682,8 -1715,8 +1759,8 @@@ msgstr "ДиÑкреттеудің ав
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "Таңдауыңызша қоршам командаларын баптау"
+ msgid "Configure Custom Shell Commands"
+ msgstr ""
#. mpgmad
#: ../translation/extra.c:99
@@@ -1699,35 -1732,40 +1776,40 @@@ msgstr "Ken ÑмулÑторын Satoh
msgid "Enable surround"
msgstr "Surround Ñ–Ñке қоÑу"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Файл бар болып тұр. Оны Ò¯Ñтінен жазу керек пе?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Түрлендіруші еÑкертуі"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Кодтауышты таңдаңыз"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Түрлендіруші қатеÑÑ–"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Түрлендіру..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Буманы тандаңыз..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Кодтауыштың баптауын Ñақтау ÑәтÑіз"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1735,77 -1773,77 +1817,77 @@@ msgstr "
"Баптау Ñақталатын бума Ñ€Ò±Ò›Ñаттарын текÑеріңіз, баÑқа атауды таңдаңыз не "
"біршама диÑк кеңіÑтігін боÑатыңыз."
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "Ондай атымен баптау бар болып тұр. БаÑқа атын көрÑетіңіз."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Қате"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Жаңа кодтауышты қоÑу"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Кодтауышты түзету"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Баптауды өшіру"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Бұл әрекет нәтижеÑінде таңдалған баптау өшіріледі. ОÑыны қалайÑыз ба?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Кодтауыштар"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Плагинді DSP тізбегіне қоÑу"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "DSP баптауын Ñақтау ÑәтÑіз"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Жаңа DSP баптауы"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "DSP баптауын түзету"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP баптаулары"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Ð¨Ñ‹Ò“Ñ‹Ñ Ð±ÑƒÐ¼Ð°ÑÑ‹:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "БаÑтапқы трек бумаÑына жазу"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "Бумалар құрылыÑын Ñақтау"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Ð¨Ñ‹Ò“Ñ‹Ñ Ñ„Ð°Ð¹Ð» аты:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1815,89 -1853,89 +1897,89 @@@ msgstr "
"Кеңейтуі (мыÑ. .mp3) автоқоÑылады.\n"
"ҮнÑіз келіÑім үшін Ð±Ð¾Ñ Ò›Ð°Ð»Ð´Ñ‹Ñ€Ñ‹Ò£Ñ‹Ð· (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Кодтауыш:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP баптауы:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Ðғымдар Ñаны:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "СÑмплдердің ÑˆÑ‹Ò“Ñ‹Ñ Ð¿Ñ–ÑˆÑ–Ð¼Ñ–:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "БаÑтапқы пішімді қалдыру"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 биттік таңбалы бүтін"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 биттік таңбалы бүтін"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 биттік таңбалы бүтін"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 биттік таңбалы бүтін"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 биттік қалқымалы"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Файл бар болÑа:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Сұрау"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Ò®Ñтінен жазу"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Кодтауыш баптауын түзету"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "ÐтауыÑыз кодтауыш"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Ð¨Ñ‹Ò“Ñ‹Ñ Ñ„Ð°Ð¹Ð»Ð´Ñ‹Ò£ кеңейтуі:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "МыÑ. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Командалық жол:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1907,7 -1945,7 +1989,7 @@@ msgstr "
"МыÑалы: lame - %o\n"
"%i ÐºÑ–Ñ€Ñ–Ñ Ñ„Ð°Ð¹Ð»Ñ‹, %o ÑˆÑ‹Ò“Ñ‹Ñ Ñ„Ð°Ð¹Ð»Ñ‹ үшін, - stdin үшін"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1917,66 -1955,72 +1999,72 @@@ msgstr "
"<small>%o - ÑˆÑ‹Ò“Ñ‹Ñ Ñ„Ð°Ð¹Ð»Ñ‹ аты\n"
"%i - уақытша ÐºÑ–Ñ€Ñ–Ñ Ñ„Ð°Ð¹Ð»Ñ‹Ð½Ñ‹Ò£ аты</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "ТәÑіл:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Pipe"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Уақытша файл"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Тег жазушыÑÑ‹</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "DSP баптау түзетушіÑÑ–"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "ÐтауÑыз DSP баптауы"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "ҚоÑу"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Сурет файлын табу мүмкін емеÑ: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2014,27 -2058,27 +2102,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "Таңдауыңызша қоршам командалары"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "Түзету"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "Жабу"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "Команданы түзету"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "Команда:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2046,17 -2090,17 +2134,17 @@@ msgstr "
"контекÑтінде жөнелтілетін болады. Ðтаудың пішімдеуін қолдануға болады. "
"МыÑалы: xdg-open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "ID:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "Таңдауыңызша атауы, мыÑ. \"Менің қоршам командам\""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
@@@ -2065,130 -2109,133 +2153,137 @@@ msgstr "
"Команданың ID-Ñ–, әдетте ол қыÑқа бірнәрÑе болуы тиіÑ, мыÑ. \"youtube_open\". "
"Және де ол бірегей болуы тиіÑ."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "Дара тректер"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "Дара тректе Ð¶Ò±Ð¼Ñ‹Ñ Ñ–Ñтейді."
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "Бірнеше трек"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "Бірнеше тректе Ð¶Ò±Ð¼Ñ‹Ñ Ñ–Ñтейді."
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "Жергілікті"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "Жергілікті файлдарда Ð¶Ò±Ð¼Ñ‹Ñ Ñ–Ñтейді."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "Қашықтағы"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "Қашықтағы файлдарда Ð¶Ò±Ð¼Ñ‹Ñ Ñ–Ñтейді (мыÑ, http:// streams)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
- msgstr ""
+ msgstr "Жалпы (баÑÑ‚Ñ‹ мәзір)"
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "ÐәрÑе баÑÑ‚Ñ‹ мәзірден көрінуі тиіÑ"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
"contains the menu path like this: \"File/My Command\", where File is the "
"menu name in the English version.</small>"
msgstr ""
+ "<small>Егер баÑÑ‚Ñ‹ мәзірге команданы қоÑқыңыз келÑе, оның атауында мәзір жолы "
+ "болғанын текÑеріңіз, келеÑідей: \"File/Менің командам\", бұл жердегі Файл - "
+ "ағылшын тіліндегі мәзір аты.</small>"
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "Команданы қоÑу"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "Өшіру"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr "Бұл әрекет таңдалған қоршам командаÑын өшіреді. ОÑыны қалайÑыз ба?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "Өшіруді раÑтау"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "ID Ð±Ð¾Ñ Ð±Ð¾Ð»Ð¼Ð°ÑƒÑ‹ және бірегей болуы тиіÑ.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "Ðтауы Ð±Ð¾Ñ Ð±Ð¾Ð»Ð¼Ð°ÑƒÑ‹ тиіÑ.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "Қоршам командаÑÑ‹ Ð±Ð¾Ñ Ð±Ð¾Ð»Ð¼Ð°ÑƒÑ‹ тиіÑ.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "Қате мәндер"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "Қолдауы бар Ð´Ñ‹Ð±Ñ‹Ñ Ð¿Ñ–ÑˆÑ–Ð¼Ð´ÐµÑ€Ñ–"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "Барлық файлдар (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "Файл(дар)ды ашу..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "Файл(дар)ды ойнату тізіміне қоÑу..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "Бума(лар)ды ойнату тізіміне қоÑу..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "Сілтемелерден өту"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr "help.kk.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "Файлдарды диÑктен өшіру"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2196,19 -2243,19 +2291,19 @@@ msgstr "
"Файлдар жоғалады. ЖалғаÑтыру керек пе?\n"
"(Бұл Ñұхбатты GTKUI плагин баптауларында Ñөндіруге болады)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "Ойнату тізімін жүктеу"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "БаÑқа файлдар (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "Ойнату тізімін қалайша Ñақтау"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "DeaDBeeF ойнату тізімі файлдары (*.dbpl)"
@@@ -2242,102 -2289,111 +2337,191 @@@ msgstr "
msgid "Nothing is selected."
msgstr "ЕшнәрÑе таңдалмады."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr "Ðемен алмаÑтыру..."
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr "КіріÑтіру..."
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr "Қиып алу"
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr "Көшіру"
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr "КіріÑтіру"
+
+#: ../plugins/gtkui/widgets.c:764
- msgid "Multiple widgets of this type are not supported"
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr "Ðемен алмаÑтыру..."
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr "КіріÑтіру..."
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr "Қиып алу"
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr "Көшіру"
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr "КіріÑтіру"
+
+ #: ../plugins/gtkui/widgets.c:942
++>>>>>>> upstream/0.6.2
+ msgid "Multiple widgets of this type are not supported"
+ msgstr "Бұл түрдегі бірнеше виджеттерге қолдау жоқ"
+
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr "Жылжытуды блоктау"
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr "Бетті Ñолға жылжыту"
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr "Бетті оңға жылжыту"
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr "Бетті өшіру"
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr "Беттің атын ауыÑтыру"
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr "Жаңа бетті қоÑу"
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr "Бағандар атауларын көрÑету"
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr "Бұл бокÑÑ‚Ñ‹ 1 Ñлементке кеңейту"
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr "Бұл бокÑÑ‚Ñ‹ 1 Ñлементке азайту"
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr "БіртектеÑ"
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr "Жазу"
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr "Толтыру"
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr "Жылжытуды блоктау"
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr "Бетті Ñолға жылжыту"
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr "Бетті оңға жылжыту"
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr "Бетті өшіру"
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr "Беттің атын ауыÑтыру"
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr "Жаңа бетті қоÑу"
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr "Бағандар атауларын көрÑету"
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr "Бұл бокÑÑ‚Ñ‹ 1 Ñлементке кеңейту"
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr "Бұл бокÑÑ‚Ñ‹ 1 Ñлементке азайту"
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr "БіртектеÑ"
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr "Жазу"
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr "Толтыру"
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr "Батырманы баптау"
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
- msgstr ""
+ msgstr "Ойнату тізімін түзету"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
- msgstr ""
+ msgstr "Ойнату тізімінің атын өзгерту"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
- msgstr ""
+ msgstr "Ойнату тізімін өшіру"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
- msgstr ""
+ msgstr "Жаңа ойнату тізімін қоÑу"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
- msgstr ""
+ msgstr "ÐÑ‚Ñ‹"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
++<<<<<<< HEAD
+msgstr ""
++=======
+ msgstr "Ойнату тізімдерді шолу"
++>>>>>>> upstream/0.6.2
diff --combined po/km.po
index f7b4295,88c76e9..29ed4c2
--- a/po/km.po
+++ b/po/km.po
@@@ -8,9 -8,9 +8,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Khmer (http://www.transifex.com/projects/p/deadbeef-player/"
"language/km/)\n"
"Language: km\n"
@@@ -19,17 -19,17 +25,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "អំពី DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s ផ្លាស់ប្ážáž½ážšáž€áŸ†ážŽážáŸ‹áž áŸážáž»"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr ""
@@@ -86,788 -86,815 +92,827 @@@ msgstr "គ្មានប្រដាá
msgid "Zero Bands"
msgstr "គ្មានក្រុមážáž“្ážáŸ’រី"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "ម៉ូណូ"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "ម៉ូណូ"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "ស្ážáŸážšáŸáž¢áž¼"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr ""
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "ផ្អាក"
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "បង្កើážáž”ញ្ជីរážáŸ’មី"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr ""
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "មានកំហុសពáŸáž›áž€áŸ†áž–ុងអានឯកសារជំនួយ"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "មានកំហុសពáŸáž›áž•áŸ’ទុកឯកសារជំនួយ"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr ""
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "ទិន្ននáŸáž™"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "បើកទិន្ននáŸáž™"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "បញ្ចួលទិន្ននáŸáž™"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "បង្កើážážáž"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "បង្កើážáž‘ីážáž¶áŸ†áž„"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "បញ្ជីរážáŸ’មី"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "ផ្ទុកបញ្ជីរ"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "រក្សាទុកបញ្ជីរ"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "ចាកចáŸáž‰"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "កែសំរួល"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "ជម្រះ"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "ជ្រើសទាំងអស់"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "ដោះជម្រើសទាំងអស់"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "ដាក់បញ្ច្រាសជម្រើស"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "ជម្រើស"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "យកចáŸáž‰"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "ច្រឹប"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "សែ្វងរក"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "ចំណងជើង"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr ""
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "អ៉ាល់បុ៑ម"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "អ្នកនិពន្ធ"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr ""
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "ចៃដន្យ"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "ផ្ទាល់ážáŸ’លួន"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "ចំណង់ចំណូលចិážáŸ’áž"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "មើល"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "របាស្ážáž¶áž“ភាព"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "ធ្វើអោយស្មើគ្នា"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "ចាក់សារážáŸ’មី"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "លំដាប់"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "លីនáŸáž¢áŸ‚៑រ"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr ""
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr ""
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "ការរង្វិលជុំ"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "រមូរចាក់សារážáŸ’មី"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr ""
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "បញ្ចប់បន្ទាប់ពីបច្ចុប្បន្ន"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr ""
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "ជំនួយ"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "ផ្លាស់ប្ážáž½ážšáž€áŸ†ážŽážáŸ‹áž áŸážáž»"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr ""
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "អំពី"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr ""
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "ស្វែងរក"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "ឈប់"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "ចាក់"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "ផ្អាក"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "មុន"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "បន្ទាប់"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "ចាក់ចែដន្យ"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "អំពី"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "លះបង់"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "ជំនួយ"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "ដានលក្ážážŽáŸ‡ážŸáž˜áŸ’áž”ážáŸ’ážáž·"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "អនុវážáŸ’áž"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "បិទ"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "មáŸážáž¶áž‘ិន្ននáŸáž™"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "លក្ážážŽáŸ‡ážŸáž˜áŸ’áž”ážáŸ’ážáž·"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "ចំណងជើង"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr ""
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "ប្រភáŸáž‘"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr ""
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "កំពុងលáŸáž„"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "ážáž¶áž€áŸ‹ážáŸ‚ងអ៉ាល់បុ៑ម"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "ម្ចាស់អ៉ាល់បុ៑ម"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr ""
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr ""
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "ក្រុម/ម្ចាស់អ៉ាល់បុ៑ម"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "ទ្រង់ទ្រាយ"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "ážáž˜áŸ’រឹម"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "ឆ្វáŸáž„"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "ស្ážáž¶áŸ†"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "បោះបង់"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "យល់ព្រម"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "ទិន្នផលកម្មវីធីជំនួយ"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "សំលáŸáž„"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr ""
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "ដាន"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr ""
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr ""
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr ""
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr ""
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr ""
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr ""
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr ""
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr ""
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr ""
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr ""
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr ""
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr ""
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr ""
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr ""
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr ""
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr ""
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr ""
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr ""
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr ""
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr ""
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr ""
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr ""
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr ""
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr ""
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr ""
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -875,122 -902,128 +920,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr ""
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr ""
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr ""
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr ""
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr ""
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr ""
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr ""
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr ""
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr ""
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr ""
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr ""
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr ""
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -998,91 -1031,100 +1049,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr ""
@@@ -1099,11 -1141,11 +1163,11 @@@ msgstr "
msgid "Default Audio Device"
msgstr ""
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1111,7 -1153,7 +1175,7 @@@
msgid "Adding files..."
msgstr "កំពុងផ្ទុកទិន្ននáŸáž™"
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr ""
@@@ -1124,139 -1166,139 +1188,149 @@@ msgid "Really close the window?
msgstr ""
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr ""
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr ""
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr ""
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr ""
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr ""
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr ""
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr ""
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr ""
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr ""
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr ""
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr ""
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr ""
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr ""
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr ""
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1264,33 -1306,31 +1338,43 @@@
" copy[r]ight, [e]lapsed\n"
msgstr ""
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
"- title\"\n"
msgstr ""
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr ""
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr ""
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr ""
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr ""
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1305,39 -1345,32 +1389,32 @@@
"Custom"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
"Album"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
msgstr ""
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr ""
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1347,7 -1380,7 +1424,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1640,7 -1673,7 +1717,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1657,111 -1690,116 +1734,116 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr ""
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr ""
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr ""
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr ""
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr ""
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr ""
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr ""
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr ""
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr ""
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr ""
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1769,89 -1807,89 +1851,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr ""
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr ""
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr ""
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr ""
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr ""
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1859,7 -1897,7 +1941,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1867,66 -1905,72 +1949,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr ""
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr ""
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr ""
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr ""
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr ""
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr ""
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr ""
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr ""
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr ""
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1954,27 -1998,27 +2042,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -1983,74 -2027,74 +2071,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2058,90 -2102,90 +2146,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2168,102 -2212,111 +2260,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/lg.po
index 16b6bbe,eaaa392..55ccf84
--- a/po/lg.po
+++ b/po/lg.po
@@@ -3,15 -3,16 +3,27 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
++<<<<<<< HEAD
+# kizito <kbirabwa at yahoo.co.uk>, 2010
+# kizito <kbirabwa at yahoo.co.uk>, 2010
++=======
+ # Kizito Birabwa <kbirabwa at yahoo.co.uk>, 2010
+ # Kizito Birabwa <kbirabwa at yahoo.co.uk>, 2010
+ # Kizito Birabwa <kbirabwa at yahoo.co.uk>, 2010
++>>>>>>> upstream/0.6.2
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Ganda (http://www.transifex.com/projects/p/deadbeef-player/"
"language/lg/)\n"
"Language: lg\n"
@@@ -20,17 -21,17 +32,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Okwanjula DeaDBeef %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "Olukalala lw'enyukakyuka eziri mu DeadBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Abaavvuunula DeaDBeeF"
@@@ -94,795 -95,822 +106,834 @@@ msgstr "Ekikangalazaddoboozi ekisooka k
msgid "Zero Bands"
msgstr "Amaloboozi gonna gadde ku zero"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Koppi ez'ebiteekateekedwa ezaaterekebwa"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "Lunaku 1 %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "Nnaku %d %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Eyimirizidwa | Ntambi %d | Awamu zimala %s"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Siteriyo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| kb %4d bs "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Luyimirizidwamu | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s%s| Hz %d | bbiti %d | %s | %d:%02d /%s | ntambi %d | Awamu zimala %s"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Kolawo olukalalala olupya"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Lukalalala olupya (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Wazewo kiremya mu kusoma fayiro ey'obuyambi"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Nnemedwa okubikkula fayiro ey'obuyambi"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Kulabula"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Fayiro"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Bikkula fayiro"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Teekako fayiro"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Teekako (ma)terekero"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Teekako obusangiro"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Kolwo olukalala olupya"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Soma olukalala lw'enyimba"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Kaza olukalala lw'enyimba"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Mala"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Kyusa"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Bisiimulewo"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Londa byonna"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Ta byonna"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Vuunika okulonda"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Ebirondedwa"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Bigyewo"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Bisagalewo byokka"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Zuula"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Erinnya"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Namba y'olutambi"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Alubamu"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Muluyimba"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Ennaku"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Muwawa"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Bye weteekateekedde"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Enteekateeka"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Endabika"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Olubaawo olulaga ebifa ku biwulirizibwa"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ekiteekateeka entabula y'amaloboozi"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "Eby'em_puliriza"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Ensengeka"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Ku ziva kumukumu"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Vunga ntambi"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Vunga alubamu"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Eby'okuddiŋana"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Akaseesa kagoberere empuliriza y'enyimba"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Akasonga kagoberere empuliriza y'enyimba"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Luno bwe luggwa yimirira"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Genda ku lutambi olutangaazidwa"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Nyamba"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Enkyukakyuka"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Kwanjula"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Abaavvuunula"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Noonya"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Yimirira"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Wuliriza"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Yimirizamu"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Olukulembedde"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Oluddako"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Wuliriza muwawa"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Kwanjula"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Mala"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Nyamba"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Ebikwata ku lutambi"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Enteekateeka"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Bikaze"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Ggala"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Ebinyonyola"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Ebirufaako"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Mutwe:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Wandikawo omutwe g'olukumba"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Kika:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Lukalala lw'ebirimu"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Oluliko"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Bifaananyi bya ku alubamu"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Muluyimba - Alubamu"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Obwuwanvu bwa lwo"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Namba y'olutambi"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Kibiina / Muluyimba w'alubamu"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Empandika:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Okwekubirira:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Ku kkono"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Ku ddyo"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Sazamu"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_Kale"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Puloguramu efulumya ebiwulirizibwa:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Ebiwulirizibwa gye bifulumira:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Ebiwulirizibwa ebya bbiti 8 bifuulibwenga bya bbiti 16"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Kwogeza"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Maanyi g'eddoboozi ly'ebiwulirizibwa:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Gyako"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Lutambi"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Ekigero ky'amaanyi ge'ddoboozi ly'ebiwulirizibwa"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Maanyi g'eddoboozi ly'ebiwulirizibwa:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Genda ku lutambi olutangaazidwa:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Olukalala lw'ongereko fayiro nga weyambisa kiwandikiro (oba "
"ekiteekateekafayiro):"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr ""
"Puloguramu bw'etandikibwa etandikirenga gye yakoma ku mulundi ogwasemba"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr ""
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Eby'empuliriza"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Teekateeka"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr ""
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr ""
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr ""
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr ""
"Ggala kireetera puloguramu okufuuka kafaananyi mu kakuŋaanyizo ka ku lubaawo"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Kisa akafaananyi ak'omu kakuŋaanyizo ka ku lubaawo"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Omutwe gw'eddirisa ng'oluyimba luwulirizibwa:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Omutwe gw'eddirisa nga puloguramu eyimirizidwa:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Ekya \"Siimula ku disiki\" kikise"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Ssawo enteekateeka eyiyo"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Bwanjo"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Bwaliriro"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Langi eziraga oluyimba we lutuuse/bwangufu bw'eddoboozi"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Langi eyawakkatikati"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Langi entangaavu"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Langi enzirugarivu"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Langi ey'omulamwa"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Bigambo"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Langi ez'oku bukonda"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"Ssawo enteekateeka eyiyo (kiva ku lulyo lwa langi olwa sisitemu naye "
"kyanguya puloguramu okulabika)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Nnyiriri kagabanyizikamubbiri"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Nnyiriri zinantagabanyizikamubbiri"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Olunyiriri olulondedwa"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Ebigambo ebirondedwa"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Akasonga"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Langi ez'oku lukalala lw'enyimba"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Langi"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Kozesa ekiwereza kimasanganzira"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Endagiriro y'ekiwereza kimasanganzira:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Pooti y'ekiwereza kimasanganzira:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Kika ky'ekiwereza:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Erinnya ery'okukozesa ku kiwereza:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Ekyama eky'oku kiwereza:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Kayungirizi"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -890,122 -918,128 +941,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr ""
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr ""
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Puloguramu enyambi"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Empandika"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Puloguramu enyambi"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Wandika ebya ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Wandika ebya ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Wandika ebya APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Gyamu ebya ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Gyamu ebya ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Gyamu ebya APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "Oluwandika lwa ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Tukuwa magezi ga kukozesa luno)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "Enkongojja y'ebiwandike eby'omu ID3v1 (iso8859-1 y'eya bulijjo)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Wandika ebya ID32.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1013,91 -1047,100 +1070,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Muluyimba / Alubamu"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Namba y'olutambi"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Lwongere ku lukalala lw'ebinaawulirizibwa"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Lugye mu lukalala lw'ebinaawulirizibwa"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Ddamu okusoma ebinnyonyola"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Luggire ddala ku sisitemu"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Yongerako oukumbo"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Kyusa mu lukumbo"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Gyawo olukumbo"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Sengekera ku"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Tosengeka"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Muyimbi/Amafuluma/Alubamu"
@@@ -1114,11 -1157,11 +1184,11 @@@ msgstr "
msgid "Default Audio Device"
msgstr "Ekyuma ekikola ku biwulirizibwa bulijjo"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1126,7 -1169,7 +1196,7 @@@
msgid "Adding files..."
msgstr "Nyongerako fayiro..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Nteekateeka..."
@@@ -1139,153 -1182,153 +1209,163 @@@ msgid "Really close the window?
msgstr "Eddirisa lino ddala liggalibwewo?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Ppeesa"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Ppeesa"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Ekikongojje"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr ""
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Obuwayiro:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr ""
" --help oba -h Bw'ossawo kamu ku buno, okoma ku kufuna bino "
"by'osoma\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Kano kaleetera puloguramu okumala\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr ""
" --version Kano kaleetera puloguramu okukoma ku kukulaga "
"olwandika lwa yo\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Kano kaleetera pulguramu okutandika enyimba\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Kano kaleetera pulguramu okukomya oluyimba\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr ""
" --pause Kano kaleetera puloguramu okuyimirizamu oluyimba\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr ""
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr ""
" --next Kano kaleetera puloguramu okutandika oluyimba oluddako "
"mu lukalala\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr ""
" --prev Kano kaleetera puloguramu okutandika olukulembera "
"lw'ebadde ko mu lukalala\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr ""
" --random Kano kaleetera puloguramu okuyita mu nyimba muwawa\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr ""
" --queue Kano kaleetera puloguramu okwongera nyimba ku "
"lukalala\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
" --nowplaying FMT Kano kaleetera puloguramu okuwandikawo erinnya "
"ly'olutambi\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1299,7 -1342,7 +1379,7 @@@ msgstr "
" r: Ebikugizo by'obwa nannyini, e: Ekitundu ky'oluyimba "
"ekiwulirizidwako\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1308,26 -1351,24 +1388,36 @@@ msgstr "
" okugeza.: --nowplaying \"%%a - %%t\" kisuubirwa "
"okuvaamu \"muyibi - linnya lya luyimba\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Olukwatakifo"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Ye"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Olukwatakifo"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Ye"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Nedda"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1342,7 -1383,7 +1432,7 @@@
"Custom"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1350,7 -1391,7 +1440,7 @@@ msgstr "
"Kkono\n"
"Dyo"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1360,13 -1401,13 +1450,13 @@@ msgstr "
"Lutambi\n"
"Alubamu"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1374,14 -1415,7 +1464,7 @@@ msgstr "
"2.3 (Tukuwa magezi kukozesa luno)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Fayiro erimu ekifaananyi embuze: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1394,7 -1428,7 +1477,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1687,7 -1721,7 +1770,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1704,111 -1738,116 +1787,116 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr ""
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr ""
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr ""
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr ""
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr ""
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr ""
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr ""
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr ""
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr ""
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr ""
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1816,89 -1855,89 +1904,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr ""
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr ""
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr ""
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr ""
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr ""
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1906,7 -1945,7 +1994,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1914,66 -1953,72 +2002,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr ""
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr ""
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr ""
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr ""
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr ""
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr ""
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr ""
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Kaza"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Fayiro erimu ekifaananyi embuze: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2001,27 -2046,27 +2095,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2030,74 -2075,74 +2124,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2105,90 -2150,90 +2199,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2215,102 -2260,111 +2313,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/lt.po
index dd25816,5a36718..d050d50
--- a/po/lt.po
+++ b/po/lt.po
@@@ -9,9 -9,9 +9,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Lithuanian (http://www.transifex.com/projects/p/deadbeef-"
"player/language/lt/)\n"
"Language: lt\n"
@@@ -21,17 -21,17 +27,17 @@@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
"%100<10 || n%100>=20) ? 1 : 2);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Apie DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s keitimų žurnalas"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF VertÄ—jai"
@@@ -88,44 -88,44 +94,52 @@@ msgstr "Atstatyti Preamp
msgid "Zero Bands"
msgstr "Atstatyti Bands"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Nustatymų rinkiniai"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 diena %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dienos %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Sustabdyta | %d takeliai | %s bendras grojimo laikas"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Sustabdyta | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -133,748 -133,775 +147,779 @@@ msgstr "
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d takeliai | %s bendras "
"grojimo laikas"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Naujas grojaraštis"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Naujas grojaraštis (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Grojaraštis"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Klaida skaitant pagalbos failÄ…"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Pagalbos failo įkelti nepavyko"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Įspėjimas"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Failas"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Atverti failÄ…(-us)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "PridÄ—ti failÄ… (-us)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "PridÄ—ti aplankÄ…(-us)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "PridÄ—ti vietÄ…"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Naujas grojaraštis"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Įkelti grojaraštį"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Išsaugoti grojaraštį"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "I_Å¡eiti"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "K_eisti"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "IÅ¡_valyti"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Pasirinkti visus"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Atžymėti viską"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Atvirkštinis pasirinkimas"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Pasirinkimas"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Pašalinti"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Apkirpti"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Ieškoti"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Rikiuoti pagal"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Pavadinimas"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Takelio numeris"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Albumas"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "AtlikÄ—jas"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Data"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Atsitiktine tvarka"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Pasirinkta"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Nustatymai"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "R_odymas"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "BÅ«senos juosta"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ekvalaizeris"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Atkūrimas"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Tvarka"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Linijinis"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Maišyti takelius"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Maišyti albumus"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Kartojimas"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Kartoti visus"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Kartoti vienÄ… dainÄ…"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Nekartoti"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Slinkimas seka atkūrimą"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Žymeklis seka atkūrimą"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Sustabdyti po dabartinÄ—s dainos"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Peršokti į dabartinį takelį"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Žinynas"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Keitimų žurnalas"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Apie"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_VertÄ—jai"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Ieškoti"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Stabdyti"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Groti"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pristabdyti"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Ankstesnis"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Sekantis"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Atsitiktinis grojimas"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Apie"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "IÅ¡eiti"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Žinynas"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Takelio savybÄ—s"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Nustatymai"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "Prit_aikyti"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Užverti"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metaduomenys"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "SavybÄ—s"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Pavadinimas:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Ä®veskite naujo stulpelio pavadinimÄ… Äia"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Tipas:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Elementų rodyklė"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Atkuriama"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Albumo dizainas"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "AtlikÄ—jas - Albumas"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "TrukmÄ—"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Takelio numeris"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "GrupÄ— / Albumo atlikÄ—jas"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Formatas:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Lygiavimas:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "KairÄ—"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Dešinė"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Atsisakyti"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_Gerai"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Išvesties įskiepis:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Išvesties įrenginys:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "8 bitų audio visada konvertuoti į 16 bitų"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Garsas"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Garsinimo režimas:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "IÅ¡jungti"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Takelis"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Garsinimo mastelis"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Pagarsinimo lygis:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Bendras pagarsinimas:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Į grojaraštį pridėti failus iš komandinės eilutės (ar failų tvarkyklės):"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Paleidus programą tęsti ankstesnę sesiją"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Prideant aplankus, nepridėti failų iš archyvų"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "Automatiškai atstatyti „Sustabdyti po dabartinės dainos“"
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Atkūrimas"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Konfigūruoti"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP Chain nustatymų rinkinys"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Įkelti"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Uždaryti į sistemos dėklą"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Nerodyti sistemos dÄ—klo piktogramos"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "Įgalinti Rusiškos CP1251 koduotės aptikimą ir perkodavimą"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Įgalinti Kinietiškos CP936 koduotės aptikimą ir perkodavimą"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Sąsajos atnaujinimo dažnis (kartai per sekundę):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Pavadinimo juostos tekstas atkuriant:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Pavadinimo juostos tekstas sustabdžius:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
"Grafinės sąsajos įskiepis (pakeitimam įsigalioti, reikia paleisti iš naujo):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Kontekstiniame meniu nerodyti „Pašalinti iš disko“"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Pridedant tik vieną aplanką, grojaraštį pavadinti automatiškai"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "GUI/Kita"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Perrašyti"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Priekinis planas"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Fonas"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Prasukimo juostos/Garso juostos spalvos"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Vidurinis"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Å viesus"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Tamsus"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Bazinis"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Tekstas"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "KortelÄ—s spalvos"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"Perašyti (bus prarasta GTK medžio peržiūra, bet pagreitės atvaizdavimas)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "LyginÄ—s eilutÄ—s"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "NelyginÄ—s eilutÄ—s"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Pasirinktos eilutÄ—s"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Pažymėtas tekstas"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Žymeklis"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "GrojaraÅ¡Äio spalvos"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Spalvos"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Įjungti tarpinį serverį"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Tarpinis serveris:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Tarpinio serverio prievadas:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Tarpinio serverio tipas:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Tarpinio serverio naudotojo vardas:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Tarpinio serverio slaptažodis:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "HTTP naudotojo agentas:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Tinklas"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -882,122 -909,128 +927,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Versija: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "AutorinÄ—s teisÄ—s"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Įskiepiai"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Formatas"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "DidÄ—jantis"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Mažėjantis"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Pasirinkti DSP įskeipį"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Įskiepis"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Žymių rašymo nustatymai"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Rašyti ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Rašyti ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Rašyti APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Å alinti ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Å alinti ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Å alinti APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 versija"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Rekomenduojama)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 simbolių koduotė (numatyta iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Rašyti ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1005,91 -1038,100 +1056,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "AtlikÄ—jas / Albumas"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Takelio numeris"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Pridėti į atkūrimo eilę"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Pašalinti iš atkūrimo eilės"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Iš naujo įkelti meta duomenis"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Pašalinti iš disko"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Pridėti stulpelį"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Keisti stulpelį"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Pašalinti stulpelį"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Grupuoti pagal"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "NiekÄ…"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "AtlikÄ—jas/Data/Albumas"
@@@ -1106,11 -1148,11 +1170,11 @@@ msgstr "Konfigūruoti %s
msgid "Default Audio Device"
msgstr "Numatytasis audio įrenginys"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1118,7 -1160,7 +1182,7 @@@
msgid "Adding files..."
msgstr "Pridedami failai..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Inicializuojama..."
@@@ -1131,128 -1173,128 +1195,138 @@@ msgid "Really close the window?
msgstr "Tikrai užverti šį langą?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Keletas reikšmių]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Raktas"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Raktas"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Reikšmė"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Rašomos žymės..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Pavadinimas:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Laukelių vardai negali prasidėti: tarpu ar _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "PridÄ—ti laukelio nepavyko"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Laukelis su tokiu vardu jau yra, pabandykite kitÄ… vardÄ…."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "PridÄ—ti laukÄ…"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Pašalinti lauką"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "Naudojimas: deadbeef [parinktys][failai]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Parinktys:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help ar -h Parodo pagalbos langą (šį) ir išeina\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Užverti grotuvą\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Parodyti versijos informaciją ir išeiti\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Atkūrti\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Sustabdyti\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pristabdyti\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Perjungti sustabdymÄ…\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr " --play-pause Jei sustabdyta atkurti, jei grojama sustabdyti\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Sekanti grojaraÅ¡Äio daina\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev AnkstesnÄ— grojaraÅ¡Äio daina\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Atsitiktinė daina grojaraštyje\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Pridėti failą(-us) į esamą grojaraštį\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
@@@ -1260,12 -1302,12 +1334,12 @@@ msgstr "
" --gui ĮSKIEPIS Nurodo kurį GUI įskiepį naudoti, numatytasis yra "
"„GTK2“\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Nusiųsti formatuotą takelių sąrašą į stdout\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1276,7 -1318,7 +1350,7 @@@ msgstr "
" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
" copy[r]ight, [e]lapsed\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1285,28 -1327,24 +1359,36 @@@ msgstr "
" pvz.: --nowplaying \"%%a - %%t\" turėtų atvaizduoti "
"„atlikėjas - pavadinimas“\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " plaÄiau http://sourceforge.net/apps/mediawiki/deadbeef/"
- "index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Numatyta"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Taip"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Numatyta"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Taip"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Ne"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1332,7 -1370,7 +1414,7 @@@ msgstr "
"GrupÄ— / Albumo atlikÄ—jas\n"
"Pasirinkta"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1340,7 -1378,7 +1422,7 @@@ msgstr "
"KairÄ—\n"
"Dešinė"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1350,7 -1388,7 +1432,7 @@@ msgstr "
"Takelis\n"
"Albumas"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1358,7 -1396,7 +1440,7 @@@ msgstr "
"MažėjanÄiai\n"
"DidÄ—janÄiai"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1366,14 -1404,7 +1448,7 @@@ msgstr "
"2.3 (Rekomenduojama)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Pixmap failo rasti nepavyko: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1385,8 -1416,8 +1460,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "PridÄ—ti Audio CD"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1678,8 -1709,8 +1753,8 @@@ msgstr "Automatinis diskretizacijos daÅ
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "Konfigūruoti pasirinktines shell komandas"
+ msgid "Configure Custom Shell Commands"
+ msgstr ""
#. mpgmad
#: ../translation/extra.c:99
@@@ -1695,35 -1726,40 +1770,40 @@@ msgstr "PirmenybÄ™ teikti Ken emu, o n
msgid "Enable surround"
msgstr "Įjungti erdvinį garsą"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Failas jau egzistuoja. Perrašyti?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Konverterio įspėjimas"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Prašome pasirinkti koduotoją"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Konverterio klaida"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Konvertuojama..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Pasirinkite aplankÄ…..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Koduotojo nustatymų rinkinio išsaugoti nepavyko"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1731,77 -1767,77 +1811,77 @@@ msgstr "
"Patikrinkite nustatymų rinkinio leidimus, pabandykite kitą pavadinimą ar "
"atlaisvinkite diske vietos"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "Nustatymų rinkinys su tokiu vardu jau yra. Pasirinkite kitą vardą."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Klaida"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "PridÄ—ti naujÄ… koduotojÄ…"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Keisti koduotojÄ…"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Pašalinti nustatymų rinkinį"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Bus pašalintas pasirinktas nustatymų rinkinys. Ar jūs įsitikinę?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Koduotojai"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Į DSP grandinę pridėti įskiepį"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Naujo DSP nustatymų rinkinio išsaugoti nepavyko"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Naujas DSP nustatymų rinkinys"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Keisti DSP nustatymų rinkinį"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP nustatymų rinkiniai"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Paskirties aplankas:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "Rašyti į takelio šaltinio aplanką"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "Išlaikyti aplanko struktūrą"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "IÅ¡vesties failas:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1811,89 -1847,89 +1891,89 @@@ msgstr "
"Plėtinys (pvz. .mp3) bus pridėtas automatiškai.\n"
"Jei paliksite tuÅ¡ÄiÄ… laukelį, bus naudojamas numatytasis (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Koduotojas:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP nustatymų rinkinys:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Kopijų skaiÄius:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Išvesties pavyzdžio formatas:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Palikti Å¡altinio formatÄ…"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 bit signed int"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 bit signed int"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 bit signed int"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 bit signed int"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 bit float"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Kai failas jau yra:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Paklausti"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Perrašyti"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Keisti koduotojo nustatymų rinkinį"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Nepavadintas koduotojas"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "IÅ¡vesties failo plÄ—tinys:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Pvz. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "KomandinÄ— eilutÄ—:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1903,7 -1939,7 +1983,7 @@@ msgstr "
"Pavyzdys: lame - %o\n"
"%i įvesties failui, %o išvesties failui, - stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1913,66 -1949,72 +1993,72 @@@ msgstr "
"<small>%o - išvesties failas\n"
"%i - laikinas įvesties failas</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Metodas:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Kanalas"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Laikinas failas"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Žymių rašyklė</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "DSP nustatymų rinkinių redaktorius"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Nepavadintas DSP nustatymų rinkinys"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "PridÄ—ti"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Pixmap failo rasti nepavyko: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2010,27 -2052,27 +2096,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "PasirinktinÄ—s shell komandos"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "Keisti"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "Užverti"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "Keisti komandÄ…"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "Komanda:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2041,17 -2083,17 +2127,17 @@@ msgstr "
"Sutartinė shell komanda. Bus įvykdyta tokiam shell kontekste kokiame buvo "
"paleista programa. Galima naudoti pavadinimo formatÄ…. Pvz. xdg-open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "ID:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "Laisva forma, pavyzdžiui „Mano shell komanda“"
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
@@@ -2060,57 -2102,57 +2146,57 @@@ msgstr "
"Komandos ID, tai turėtų būti kažkas trumpo, pvayzdžiui „youtube_atverti“. "
"Negali kartotis."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "Pavieniai takeliai"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "Veikia su vienu takeliu."
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "Keletas takelių"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "Veikia su keliais takeliais."
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "Vietinis"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "Veikia su vietiniais failais."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "Nutolęs"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "Veikia su nutolusiais failais (pvz. http:// streams)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "Elementas turėtų atsirasti pagrindiniame meniu"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2118,90 -2160,90 +2204,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "PridÄ—ti komandÄ…"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "Pašalinti"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr "Bus pašalinta pasirinkta shell komanda. Ar jūs įsitikinę?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "Patvirtinti pašalinimą"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "ID negali bÅ«ti tuÅ¡Äias ar kartotis.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "Pavadinimas negali bÅ«ti tuÅ¡Äias.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "Shell komanda negali bÅ«ti tuÅ¡Äia.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "Netinkamos reikšmės"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2228,102 -2270,111 +2318,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/nl.po
index 64692ca,ffcb9f4..7b099a7
--- a/po/nl.po
+++ b/po/nl.po
@@@ -9,9 -9,9 +9,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Dutch (http://www.transifex.com/projects/p/deadbeef-player/"
"language/nl/)\n"
"Language: nl\n"
@@@ -20,17 -20,17 +26,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Over DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s logboek van wijzigingen"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr ""
@@@ -89,792 -89,819 +95,831 @@@ msgstr "Preamp op nul
msgid "Zero Bands"
msgstr "Banden op nul"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Voorinstellingen"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 dag %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dagen %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Gestopt | %d sporen | %s totale speeltijd"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Gepauzeerd | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d sporen | %s totale speeltijd"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Nieuwe speellijst"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Nieuwe speellijst (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Fout bij het lezen van het hulpbestand"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Kon hulpbestand niet laden"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Waarschuwing"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Bestand"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Open bestand(en)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Voeg bestand(en) toe"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Voeg map(pen) toe"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Voeg locatie toe"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nieuwe speellijst"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Laad speellijst"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Speellijst opslaan"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Afsluiten"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Bewerken"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Wissen"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Selecteer alles"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Deselecteer alles"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Selectie omkeren"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Selectie"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Verwijderen"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Bijsnijden"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Zoeken"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Titel"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Spoornummer"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artiest"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Datum"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Willekeurig"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Aangepast"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Voorkeuren"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Beeld"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Statusbalk"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Equalizer"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Afspelen"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Ordenen"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Lineair"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Sporen schuffelen"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Albums schuffelen"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Herhalend"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Bladeren volgt afspelen"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Aanwijzer volgt afspelen"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Stop na huidig"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Spring naar huidige spoor"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Hulp"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Logboek van wijzigingen"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Over"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Vertalers"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Zoeken"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Stoppen"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Afspelen"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pauzeren"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Vorige"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Volgende"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Willekeurig afspelen"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Over"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Afsluiten"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Hulp"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Eigenschappen van spoor"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Instellingen"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Toepassen"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Sluiten"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Bijkomende gegevens"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Eigenschappen"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Titel:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Voer hier een nieuwe kolomtitel in"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Type:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Index van elementen"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Aan het afspelen"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Albumkunst"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Artiest - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Duur"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Spoornummer"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Groep / Album Artiest"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Opmaaktype:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Uitlijning:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Links"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Rechts"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Annuleer"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Uitvoerplugin:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Uitvoerapparaat:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "8-bit-audio altijd omzetten naar 16-bit"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Geluid"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Replaygain modus:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Uitschakelen"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Spoor"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Replaygain piek schaal"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Replaygain voorversterking:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Voeg bestanden toe vanaf de opdrachtregel (of met de bestandbeheerder) aan "
"deze speellijst:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Hervat vorige sessie bij opstarten"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Niet toevoegen vanuit archieven bij het toevoegen van mappen"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Afspelen"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Configureer"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP Chain voorinstelling"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Laden"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Sluiten minimaliseert naar systeemvak"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Verberg systeemvakpictogram"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Verversingssnelheid van gebruikersschil (keren per seconde):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Titelbalktekst gedurende afspelen:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Titelbalktekst wanneer gestopt:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "GUI Plugin (wijzigen vereist herstart)"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Verberg \"Verwijder van schijf\"-element in het contekstmenu"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
"Geef speellijsten automatisch een naam bij het toevoegen van een enkele map"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Negeer"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Voorgrond"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Achtergrond"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Kleuren zoekbalk/volumebalk"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Midden"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Licht"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Donker"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Basis"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Tekst"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Tabstrook-kleuren"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "Negeer (geen boomstructuurthema, maar snellere weergave)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Even rij"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Oneven rij"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Geselecteerde rij"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Geselecteerde tekst"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Aanwijzer"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Speellijst-kleuren"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Kleuren"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Schakel Proxy Server in"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Proxy Server adres:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Proxy Server poort:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Proxy type:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Proxy gebruikersnaam:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Proxy wachtwoord:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Netwerk"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -882,122 -909,128 +927,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Versie: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Auteursrecht"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Plugins"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Opmaaktype:"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Oplopend"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Aflopend"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Selecteer DSP-plugin"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Plugin"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Instellingen van etiketschrijver"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ID3v2 schrijven"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ID3v1 schrijven"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "APEv2 schrijven"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "ID3v2 verwijderen"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "ID3v1 verwijderen"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "APEv2 verwijderen"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 versie"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (aangeraden)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 tekencodering (standaard is iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ID3v2.4 schrijven"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1005,91 -1038,100 +1056,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Artiest / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Spoornr."
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Aan de speelwachtrij toevoegen"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Uit speelwachtrij verwijderen"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Herlaad bijkomende gegevens"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Verwijder van schijf"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Kolom toevoegen"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Kolom bewerken"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Kolom verwijderen"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Groeperen op"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Geen"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Artiest/Datum/Album"
@@@ -1106,11 -1148,11 +1170,11 @@@ msgstr "Configureer %s
msgid "Default Audio Device"
msgstr "Standaard geluidapparaat"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1118,7 -1160,7 +1182,7 @@@
msgid "Adding files..."
msgstr "Bestanden aan het toevoegen..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Aan het initialiseren..."
@@@ -1131,140 -1173,140 +1195,150 @@@ msgid "Really close the window?
msgstr "Dit venster echt sluiten?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Meerdere waarden] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Toets"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Toets"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Waarde"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Etiketten aan het schrijven..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Naam:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Veldnamen moeten niet beginnen met : of _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Kan veld niet toevoegen"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Veld met deze naam bestaat reeds, probeer a.u.b. andere naam."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Voeg veld toe"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Verwijder veld"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Opties:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help or -h Drukt hulp af (dit bericht) en sluit af\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Speler afsluiten\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Versie-informatie afdrukken en sluiten\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Afspelen beginnen\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Afspelen stoppen\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Afspelen pauzeren\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Pauze schakelen\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
" --play-pause Begin afspelen indien gestopt, anders pauze schakelen\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Volgend nummer in speellijst\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Vorig nummer in speellijst\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Willekeurig nummer in speellijst\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Bestand(en) toevoegen aan speellijst\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Afdrukken geformatteerde spoornaam naar stdout\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1275,7 -1317,7 +1349,7 @@@ msgstr "
" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
" copy[r]ight, [e]lapsed\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1284,28 -1326,24 +1358,36 @@@ msgstr "
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
"- title\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " voor meer infor, zie http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Standaard"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Ja"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Standaard"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Ja"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Nee"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1331,7 -1369,7 +1413,7 @@@ msgstr "
"Groep / Album Artiest\n"
"Aangepast"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1339,7 -1377,7 +1421,7 @@@ msgstr "
"Links\n"
"Rechts"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1349,7 -1387,7 +1431,7 @@@ msgstr "
"Spoor\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1357,7 -1395,7 +1439,7 @@@ msgstr "
"Oplopend\n"
"Aflopend"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1365,14 -1403,7 +1447,7 @@@ msgstr "
"2.3 (Aangeraden)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Kon geen pixmapbestand vinden: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1385,7 -1416,7 +1460,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1679,7 -1710,7 +1754,7 @@@ msgstr "Automatische Samplerate (negeer
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1696,35 -1727,40 +1771,40 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Het bestand bestaat al. Overschrijven?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Waarschuwing van omzetter"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Kies a.u.b. een codeerder"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Fout van omzetter"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Bezig met omzetten..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Selecteer map..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Kon codeerder-voorinstelling niet opslaan"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1732,79 -1768,79 +1812,79 @@@ msgstr "
"Controleer de maprechten voor voorinstelling, probeer een andere titel te "
"kiezen, of maak wat schijfruimte vrij"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
"Voorinstelling met dezelfde naam bestaat al. Probeer een andere titel te "
"kiezen."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Fout"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Voeg nieuwe codeerder toe"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Codeerder bewerken"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Verwijder voorinstelling"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Dit zal de geselecteerde voorinstelling verwijderen. Weet u het zeker?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Codeerders"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Voeg plugin toe aan DSP-ketting"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Kon DSP-voorinstelling niet opslaan"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Nieuwe DSP-voorinstelling"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "DSP-voorinstelling bewerken"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP-voorinstellingen"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Uitvoermap:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Naam van uitvoerbestand:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1814,89 -1850,89 +1894,89 @@@ msgstr "
"Extensie (bijv. .mp3) zal automatisch worden toegevoegd.\n"
"Laat het veld leeg voor standaard (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Codeerder:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP-voorinstelling:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Aantal draadjes:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Bestandtype van uitvoer-voorbeeld:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Behoud bronbestandtype"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 bit signed int"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 bit signed int"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 bit signed int"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 bit signed int"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 bit float"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Wanneer het bestand bestaat:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Vraag bevestiging"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Overschrijf"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Bewerk voorinstelling van codeerder"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Naamloze codeerder"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Extensie van uitvoerbestand:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Bijv. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Opdrachtregel:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1906,7 -1942,7 +1986,7 @@@ msgstr "
"Voorbeeld: lame - %o\n"
"%i voor invoerbestand, %o voor uitvoerbestand, - for stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1916,66 -1952,72 +1996,72 @@@ msgstr "
"<small>%o - uitvoerbestandnaaam\n"
"%i - tijdelijke invoerbestandnaam</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Methode:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Pijp"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Tijdelijk bestand"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Etiketschrijver</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "DSP voorinstellingbewerker"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Naamloze DSP voorinstelling"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Toevoegen"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Kon geen pixmapbestand vinden: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2013,27 -2055,27 +2099,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2042,74 -2084,74 +2128,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2117,90 -2159,90 +2203,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2227,102 -2269,111 +2317,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/pl.po
index e536cfc,f722b92..99098bd
--- a/po/pl.po
+++ b/po/pl.po
@@@ -5,17 -5,20 +5,30 @@@
# Translators:
# Grzegorz Gibas <amigib at gmail.com>, 2010
# Åukasz JasiÅ„ski <alvarus at alvarus.org>, 2010
++<<<<<<< HEAD
+# mati75 <mati75 at linuxmint.pl>, 2013
++=======
+ # Mateusz Åukasik <mati75 at linuxmint.pl>, 2013-2014
+ # Mateusz Åukasik <mati75 at linuxmint.pl>, 2013
++>>>>>>> upstream/0.6.2
# Piotr Sokół <psokol at jabster.pl>, 2010
- # RyD0pR3c <prendter at gmail.com>, 2013
- # RyD0pR3c <prendter at gmail.com>, 2013
+ # Tazik_85 <inactive+Tazik_85 at transifex.com>, 2014
+ # Zetok <prendter at gmail.com>, 2013
+ # Tazik_85 <inactive+Tazik_85 at transifex.com>, 2014
+ # Zetok <prendter at gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-23 13:40+0000\n"
+"Last-Translator: mati75 <mati75 at linuxmint.pl>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Polish (http://www.transifex.com/projects/p/deadbeef-player/"
"language/pl/)\n"
"Language: pl\n"
@@@ -25,17 -28,17 +38,17 @@@
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "O programie DeaDBeef %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "Lista zmian w DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "TÅ‚umacze"
@@@ -92,46 -95,46 +105,54 @@@ msgstr "Wyzeruj Preamp
msgid "Zero Bands"
msgstr "Wyzeruj pojedyncze"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Zapisz ustawienia..."
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 dzień %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dni %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr ""
"Zatrzymano odtwarzanie | %d ścieżek | całkowity czas trwania listy "
"odtwarzania: %s"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kb/s "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Wstrzymano odtwarzanie |"
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -139,748 -142,773 +160,777 @@@ msgstr "
"%s%s %s| %d Hz | %d bitów | %s | %d:%02d / %s | %d ścieżek | całkowity czas "
"trwania listy odtwarzania: %s"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Nowa lista odtwarzania"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Nowa lista odtwarzania (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Playlisty z kartami"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Playlista"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "Podziałka (góra i dół)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "Podziałka (lewo i prawo)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Karty playlist"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Właściwości zaznaczenia"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Wyświetlanie okładki albumu"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "Zakres"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "Spektrum"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
- msgstr ""
+ msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
- msgstr ""
+ msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Przycisk"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Nie można odczytać pliku pomocy"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Wystąpił błąd przy wczytywaniu pliku pomocy"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- "Odtwarzacz obecnie wykonuje zadania w tle. Jeśli wyjdziesz teraz, zadania "
- "zostaną anulowane lub przerwane. Może to skutkować utratą danych."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "Czy wciąż chcesz wyjść?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Ostrzeżenie"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Plik"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Otwórz..."
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Dodaj..."
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Dodaj katalog..."
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Dodaj położenie..."
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nowa lista odtwarzania"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Wczytaj listÄ™ odtwarzania..."
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Zapisz listÄ™ odtwarzania"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "Za_kończ"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Edycja"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "Wy_czyść"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Zaznacz wszystkie"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Odznacz wszystkie"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Odwróć zaznaczenie"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Zaznaczenie"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Usuń"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Usuń pozostałe"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Znajdź"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Sortuj według"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Tytuł"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Numer utworu"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Wykonawca"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Data"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Losowo"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "WÅ‚asny"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Preferencje"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Widok"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Pasek stanu"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Korektor dźwięku"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "Tryb projektowania"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "Odtwarzanie"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Kolejność"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Liniowa"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Tasuj ścieżki"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Tasuj albumy"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Powtarzanie"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Zapętl wszystko"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Zapętl pojedynczą piosenkę "
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Nie zapętlaj"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Przewijanie podąża za odtwarzaniem"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Kursor podąża za odtwarzaniem"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Zatrzymaj po bieżącym utworze"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Przejdź do bieżącego nagrania"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "Pomo_c"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "Lista zmian"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "O progr_amie"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_TÅ‚umacze"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Szukaj"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Zatrzymaj"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Odtwarzaj"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Wstrzymaj"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Poprzedni"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Następny"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Odtwarzaj losowo"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "O programie"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Zakończ"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Pomoc"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Właściwości utworu"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "Lokalizacja:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Ustawienia"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "Z_astosuj"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "Zamknij"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadane"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Właściwości"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Tytuł:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Wpisz nowÄ… nazwÄ™ kolumny"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Typ:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Numer ścieżki"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Odtwarzanie"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Okładka albumu"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Wykonawca - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Długość"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Numer utworu"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Wykonawca albumu"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Format:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Wyrównanie:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Lewo"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Prawo"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "An_uluj"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Wtyczka wyjścia:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Urządzenie wyjścia:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Zawsze konwertuj 8 bitowe audio do 16 bitowego"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr "Zawsze konwertuj 16 bitowe audio do 24 bitowego"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Dźwięk"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Tryb Replaygain:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Wyłącz"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Numer utworu"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Szczyt skali Replaygain"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Przedwzmacniacz replaygain:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Przedwzmacniacz powszechny"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr "Domyślna lista odtwarzania:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Wznowienie odtwarzania po uruchomieniu programu"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Nie dodawaj z archiwów podczas dodawania folderów"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "Automatycznie resetuj \"Zatrzymaj po bieżącym utworze\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Odtwarzanie"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Konfiguracja"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr ""
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Åaduj"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Ukrywanie okna do obszaru powiadamiania zamiast zamykania"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Ukrycie ikony obszaru powiadamiania"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "Detekcja i zapisywanie Rosyjskiego CP1251"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Detekcja i zapisywanie Chińskiego CP936"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Częstotliwość odświeżania interfejsu (w ciągu sekundy):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Zawartość paska tytułu podczas odtwarzania:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Zawartość paska tytułu po zatrzymaniu odtwarzania:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
"Wtyczka interfejsa graficznego (zmiana potrzebuje uruchomienia ponowia)"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr "Odtwarzacz"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
- msgstr ""
+ msgstr "Zamknij listy odtwarzania środkowym klawiszem myszy"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
- msgstr ""
+ msgstr "Wyświetlaj aktualnie odtwarzany utwór pogrubioną czcionką"
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Ukrycie polecenia „Usuń pliki z dysku†w menu podręcznym"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Automatycznie nazywaj playlisty podczas dodawania pojedynczego folderu"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
- msgstr ""
+ msgstr "Automatycznie dopasuj szerokość kolumn do rozmiaru okna"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "GUI/Różne"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "WÅ‚asne"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Pierwszoplanowy"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Drugoplanowy"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Pasek przewijania i głośności"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Åšrodkowy"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Jasny"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Ciemny"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Baza"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Tekst"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Karty"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "Podmień (traci motyw GTK treeview, ale przyspiesza renderowanie)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Parzysty wiersz"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Nieparzysty wiersz"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Zaznaczony wiersz"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Zaznaczony tekst"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Kursor"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Listy odtwarzania"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Kolory"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Serwer pośredniczący"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Adres:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Port:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Typ:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Nazwa użytkownika:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Hasło:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "HTTP User Agent:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "Edytuj mapowanie typu zawartości"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Sieć"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr "Przydzielone skróty klawiszowe:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr "Działanie:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<Not set>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr "Kombinacja klawiszy:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Globalne skróty klawiszowe"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -888,122 -916,128 +938,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr "_Domyślne"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "Skróty klawiszowe"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Wersja:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Prawa autorskie"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Wtyczki"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "Grupuj według ..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "Sortuj według ..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Format"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "WzrastajÄ…co"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "MalejÄ…co"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Wybieraj wtyczkÄ™ DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Wtyczki"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Ustawienia edytora tagów"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Zapisywanie ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Zapisywanie ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Zapisywanie APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Usuwanie ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Usuwanie ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Usuwanie APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "Wersja ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (rekomendowana)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "Kodowanie znaków ID3v1 (domyślnie iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Zapisywanie ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "Mapowanie typu zawartości"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1011,91 -1045,100 +1067,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "Zresetuj do domyślnych"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "Typ zawarotści:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "Wtyczki:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr "Właściwości przycisku"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr "Kolor:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr "Kolor tekstu:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr "Ikona:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr "Etykieta:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr "Wybierz działanie"
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Wykonawca / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Numer ścieżki"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Dodaj do kolejki"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Usuń z kolejki"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Wczytaj ponownie metadane"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Usuń z dysku"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Dodaj kolumnÄ™"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Edytuj kolumnÄ™"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Usuń kolumnę"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Grupowanie"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Brak"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Artysta/Data/Album"
@@@ -1112,19 -1155,19 +1181,19 @@@ msgstr "Konfiguruj %s
msgid "Default Audio Device"
msgstr "Domyślne urządzenie dźwiękowe"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
- msgstr ""
+ msgstr "Zmodyfikowałeś skróty klawiszowe, ale nie zapisałeś zmian."
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
- msgstr ""
+ msgstr "Kontynuować bez zapisywania zmian?"
#: ../plugins/gtkui/progress.c:56
msgid "Adding files..."
msgstr "Dodawanie plików..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Inicjalizowanie..."
@@@ -1137,131 -1180,131 +1206,141 @@@ msgid "Really close the window?
msgstr "Zamknąć okno?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Wiele wartości]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Typ"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Typ"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Wartość"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[Wiele wartości]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Zapisywanie tagów..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Nazwa pola"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "ImiÄ™:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Nazwa nie może zaczynać się od : lub _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Nie można dodać pola"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Pole o takiej nazwie już istnieje, proszę spróbować innej nazwy."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Dodaj..."
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Usuń"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "Użycie: deadbeef [opcje] [--] [plik(i)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Opcje:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr ""
" --help lub -h Wyświetla pomoc (ten tekst) i wychodzi z programu\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Wychodzi z programu\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Wyświetla wersję programie i wychodzi\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Zaczyna odtwarzanie\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Zatrzymuje odtwarzanie\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Wstrzymuje odtwarzanie\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Włącz-wyłącz pauzę\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
" --play-pause Odtwarzaj jeśli zatrzymane, w innym wypadku pauzuj\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Następny utwór na liście odtwarzania\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Poprzedni utwór na liście odtwarzania\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Losowy utwór na liście odtwarzania\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr ""
" --queue Dodaje plik(i) do istniejÄ…cej listy odtwarzania\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
@@@ -1269,12 -1312,12 +1348,12 @@@ msgstr "
" --gui WTYCZKA Wybiera której wtyczki GUI użyć, domyślną jest "
"\"GTK2\"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Wysyła sformatowaną nazwę utworu do stdout\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1285,7 -1328,7 +1364,7 @@@ msgstr "
" [d]ługość, [n]umer utworu, [r]ok, [k]omentarz,\n"
" prawa auto[r]skie, [e]pozostało\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1294,28 -1337,24 +1373,36 @@@ msgstr "
" np.: --nowplaying \"%%a - %%t\" powinno wyświetlić "
"\"artysta - tytuł\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " więcej informacji na http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Domyślne"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Tak"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Domyślne"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Tak"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Nie"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1341,7 -1380,7 +1428,7 @@@ msgstr "
"Zespół / Wykonawca albumu\n"
"WÅ‚asny"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1349,7 -1388,7 +1436,7 @@@ msgstr "
"Lewo\n"
"Prawo"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1359,7 -1398,7 +1446,7 @@@ msgstr "
"Utwór\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1367,7 -1406,7 +1454,7 @@@ msgstr "
"WzrastajÄ…co\n"
"MalejÄ…co"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1375,14 -1414,7 +1462,7 @@@ msgstr "
"2.3 (Rekomendowany)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Nie można znaleźć pliku pixmapy: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1395,8 -1427,8 +1475,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "Dodaj audio CD"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1691,8 -1723,8 +1771,8 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "Konfiguruj własne polecenia shell"
+ msgid "Configure Custom Shell Commands"
+ msgstr ""
#. mpgmad
#: ../translation/extra.c:99
@@@ -1707,113 -1739,118 +1787,121 @@@ msgstr "
#: ../translation/extra.c:102
msgid "Enable surround"
msgstr "Włącz dźwięk przestrzenny"
++<<<<<<< HEAD
++=======
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
++>>>>>>> upstream/0.6.2
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Plik już istnieje. Nadpisać?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Ostrzerzenie konwertera"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Wybierz enkoder"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "BÅ‚Ä…d konwertera"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Konwertowanie..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Wybierz folder..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "BÅ‚Ä…d"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Dodaj nowy enkoder"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Edytuj enkoder"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Usuń ustawienie"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
"Ta czynność spowoduje usunięcie wybranego ustawienia. Czy jesteś pewien?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Enkodery"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Dodaj wtyczkę do łańcucha DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Błąd zapisu ustawień DSP"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Nowe ustawienia DSP"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Edytuj ustawienia DSP"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "Ustawienia DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Folder wyjściowy:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "Zapisz do folderu źródłowego ścieżki"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "Zachowaj strukturÄ™ folderu"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Nazwa pliku wyjściowego"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1823,89 -1860,89 +1911,89 @@@ msgstr "
"Rozszerzenie (np. .mp3) będzie dodane automatycznie.\n"
"Pozostaw to pole dla domyślnego (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Enkoder:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "Ustawienie DSP:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Ilość wątków:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Wyjściowa częstotliwość próbkowania formatu:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Zachowaj format źródłowy"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Jeśli plik istnieje:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Pytaj"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Nadpisz"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Nienazwany enkoder"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Rozszerzenie pliku wyjściowego:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Np. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Linia poleceń:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1915,7 -1952,7 +2003,7 @@@ msgstr "
"Przykład: lame - %o\n"
"%i dla pliku wejściowego, %o dla pliku wyjściowego, - dla stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1925,66 -1962,72 +2013,72 @@@ msgstr "
"<small>%o - nazwa pliku wyjściowego\n"
"%i - tymczasowa nazwa pliku wejściowego</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Metoda:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Plik tymczasowy"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
- msgstr ""
+ msgstr "Edytor ustawień DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Dodaj"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Nie można znaleźć pliku pixmapy: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2014,27 -2057,27 +2108,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "WÅ‚asne komendy Shell"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "Edytuj"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "Zamknij"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "Edytuj komendÄ™"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "Komenda:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2046,17 -2089,17 +2140,17 @@@ msgstr "
"została uruchomiona aplikacja. Formatowanie tytułu może zostać użyte. "
"Przykład: xdg-open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "ID:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
@@@ -2065,57 -2108,57 +2159,57 @@@ msgstr "
"ID komendy, zazwyczaj powinno być to coś krótkiego, na przykład "
"\"otwórz_youtube\". Musi być unikalne."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "Pojedyncze ścieżki"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "Działa na pojedynczej ścieżce."
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "Wiele ścieżek"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "Działa na wielu ścieżkach"
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "Lokalnie"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "Działa na plikach lokalnych."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "Zdalnie"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "Działa na zdalnych plikach (np. http:// streams)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "Pozycja powinna pojawić się w głównym menu"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2123,72 -2166,72 +2217,76 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "Dodaj komendÄ™"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "Usuń"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr "To działanie usunie wybraną komendę shell. Czy na pewno to zrobić?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "Potwierdzenie usunięcia"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "ID musi coś zawierać i być unikalne.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "Tytył musi coś zawierać.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "Komenda shell musi coś zawierać.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "Nieprawidłowe wartości"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "Wspierane formaty dźwięku"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "Wszystkie pliki (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "Otwórz plik(i)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "Dodaj plik(i) do playlisty..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "Dodaj katalog(i) do playlisty..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
- msgstr ""
+ msgstr "Podążaj za dowiązaniami symbolicznymi"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr "help.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "Usuń pliki z dysku"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2196,19 -2239,19 +2294,19 @@@ msgstr "
"Pliki zostaną utracone. Kontynuować?\n"
"(Ten dialog może zostać wyłączony w ustawieniach wtyczki GTKUI)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "Wczytaj PlaylistÄ™"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "Inne pliki (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "Zapisz playlistÄ™ jako"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "Plik playlisty DeaDBeeF (*.dbpl)"
@@@ -2235,102 -2278,111 +2333,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr "Nic nie wybrano."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr "ZastÄ…p..."
+
+#: ../plugins/gtkui/widgets.c:599
- msgid "Insert..."
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr "ZastÄ…p..."
+
+ #: ../plugins/gtkui/widgets.c:777
++>>>>>>> upstream/0.6.2
+ msgid "Insert..."
+ msgstr "Wstaw..."
+
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr "Wytnij"
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr "Kopiuj"
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr "Wklej"
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr "Blokada ruchu"
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr "Przesuń kartę w lewo"
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr "Przesuń kartę w prawo"
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr "Usuń kartę"
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr "Zmień nazwę karty"
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr "Dodaj nowÄ… kartÄ™"
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr "Pokaż nagłówki kolumn"
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr "Homogeniczny"
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr "Rozszerz"
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr "Wypełnij"
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr "Wytnij"
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr "Kopiuj"
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr "Wklej"
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr "Blokada ruchu"
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr "Przesuń kartę w lewo"
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr "Przesuń kartę w prawo"
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr "Usuń kartę"
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr "Zmień nazwę karty"
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr "Dodaj nowÄ… kartÄ™"
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr "Pokaż nagłówki kolumn"
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr "Homogeniczny"
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr "Rozszerz"
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr "Wypełnij"
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr "Konfiguruj przycisk"
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr "Edytuj playlistÄ™"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr "Zmień nazwę playlisty"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr "Usuń playlistę"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr "Dodaj nowÄ… playlistÄ™"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr "Nazwa"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr "PrzeglÄ…darka playlisty"
diff --combined po/pt.po
index fb476f9,3a3e3f7..32207f1
--- a/po/pt.po
+++ b/po/pt.po
@@@ -3,13 -3,13 +3,18 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
- # Sérgio Marques <smarquespt at gmail.com>, 2013
+ # Sérgio Marques <smarquespt at gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 21:02+0000\n"
++>>>>>>> upstream/0.6.2
"Last-Translator: Sérgio Marques <smarquespt at gmail.com>\n"
"Language-Team: Portuguese (http://www.transifex.com/projects/p/deadbeef-"
"player/language/pt/)\n"
@@@ -19,17 -19,17 +24,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Sobre o DeaDBeef %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "Alterações no DeaDBeef %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Tradutores do DeaDBeeF"
@@@ -86,793 -86,820 +91,832 @@@ msgstr "Amplificador nulo
msgid "Zero Bands"
msgstr "Bandas nulas"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Pré-ajustes"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 dia %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dias %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Parado | %d faixas | %s reproduções"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Estéreo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Em pausa | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d faixas | %s reproduções"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Nova lista de reprodução"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Nova lista de reprodução (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Lista de reprodução com separadores"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Lista de reprodução"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "Separador (superior e inferior)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "Separador (esquerda e direita)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Separadores de lista de reprodução"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Propriedades da seleção"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Imagem do álbum"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "Scope"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "Espetro"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Botão"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr "Barra de procura"
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr "Controlos de reprodução"
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr "Barra de volume"
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Falha ao abrir a ajuda"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Falha ao carregar a ajuda"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- "A aplicação está a ser executada em segundo plano. Se a fechar, as tarefas "
- "serão canceladas e interrompidas. Pode perder dados."
+ "A aplicação está a executar ações em segundo plano. Se sair agora, as "
+ "tarefas serão canceladas ou interrompidas. Poderá provocar a perda de dados."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "Quer mesmo sair?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Aviso"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Ficheiro"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "Abrir ficheir_o(s)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Adicionar ficheiro(s)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Adicionar pasta(s)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Adicionar local"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nova lista de reprodução"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Carregar lista de reprodução"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Gravar lista de reprodução"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Sair"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Editar"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Limpar"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Marcar tudo"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Desmarcar tudo"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Inverter seleção"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Seleção"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Remover"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Cortar"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Procurar"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Ordenar por"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "TÃtulo"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Número de faixa"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Ãlbum"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artista"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Data"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Aleatório"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Personalizar"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Preferências"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Ver"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Barra de estado"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Equalizador"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "Modo de desenho"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "Re_produção"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Organização"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Linear"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Desordenar faixas"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Desordenar álbuns"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Repetição"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Repetir tudo"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Repetir uma faixa"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Não repetir"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Deslocamento segue a reprodução"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Cursor segue a reprodução"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
msgstr "Parar após a faixa atual"
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr "Parar após o álbum atual"
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Ir para a faixa atual"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "A_juda"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Alterações"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Sobre"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Tradutores"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Procurar"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Parar"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Reproduzir"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pausa"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Anterior"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Seguinte"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Reprodução aleatória"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Sobre"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Sair"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Ajuda"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Propriedades da faixa"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "Localização:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Definições"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Aplicar"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "Fe_char"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Detalhes"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Propriedades"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "TÃtulo:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Indique o novo tÃtulo da coluna"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Tipo:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Ãndice de itens"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Reprodução"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Capa do álbum"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Artista - Ãlbum"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Duração"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Número da faixa"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Banda/Artista do álbum"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Formato:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Alinhamento:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Esquerda"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Direita"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Cancelar"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "C_onfirmar"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Sistema de som:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Dispositivo de som:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Converter áudio 8 bits para 16 bits"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr "Converter áudio 16 bits para 24 bits"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Som"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Modo Replay Gain:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Desativar"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Faixa"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Escala Replay Gain"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Amplificador Replaygain:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Amplificador:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Adicionar ficheiros via linha de comandos (ou gestor de ficheiros) para esta "
"lista de reprodução:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Retomar sessão anterior ao iniciar"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Ao adicionar pastas não adicionar arquivos"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr ""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr "A opção \"Parar após a faixa atual\" será desligada após a ativação"
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr "A opção \"Parar após o álbum atual\" será desligada após a ativação"
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Reprodução"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Configurar"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Pré-ajustes DSP"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "Carr_egar"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Fechar minimiza para a área de notificação"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Ocultar Ãcone da área de notificação"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr "Ativar deteção e codificação de SHIFT-JIS japonês"
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "Ativar deteção e codificação de Russo CP1251"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Ativar deteção e codificação de Mandarim CP936"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Taxa de atualização da interface (vezes por segundo):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Barra de tÃtulo ao reproduzir:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Barra de tÃtulo se parada:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "Extra da interface (tem que reiniciar):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr "Reprodutor"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr "Fechar lista de reprodução com a roda do rato"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr "Utilizar letra a negrito para a faixa em reprodução"
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Ocultar item de menu \"Eliminar do disco\""
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr "Ocultar item de menu \"Remover do disco\""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Ao adicionar uma pasta dar nome às listas de reprodução"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr "Ajustar colunas para caber na janela"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "Interface/Outras"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Sobrepor"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Principal"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Secundária"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Cor das barras de volume/procura"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Normal"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Claro"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Escuro"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Base"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Texto"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Cores do separador"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "Sobrepor (perde a vista em árvore mas acelera o processamento)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Linha par"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Linha Ãmpar"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Linha selecionada"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Texto selecionado"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Cursor"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Cores da lista de reprodução"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Cores"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Ativar servidor proxy"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Endereço do servidor proxy:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Porta do servidor proxy:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Tipo de proxy:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Utilizador do proxy:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Senha do proxy:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "Agente HTTP:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "Editar mapeamento de tipo de conteúdo"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Rede"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr "Atalhos atribuÃdos:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr "Ação:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<Não definido>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr "Combinação de teclas:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Tecla de atalho global"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -884,122 -911,128 +928,128 @@@ msgstr "
"As alterações não serão gravadas\n"
"se não premir Aplicar."
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr "Pré-_definições"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "Teclas de atalho"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Versão:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Direitos de autor"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Extras"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr "Definir tÃtulo personalizado"
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "Agrupar por..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "Ordenar por..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Formato"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Ascendente"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Descendente"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Selecione o extra DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Extra"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Definições do editor de detalhes"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Gravar ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Gravar ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Gravar APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Remover ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Remover ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Remover APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "Versão ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Recomendado)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "Codificação de caracteres ID3v1 (por definição é iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Gravar ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "Mapeamento de tipo de conteúdo"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1011,91 -1044,106 +1061,110 @@@ msgstr "
"\" e precisam de ser descodificados pelo extra \"stdmpg\" ou pelo extra "
"\"ffmpeg\"."
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "Restaurar definições originais"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "Tipo de conteúdo:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "Extras:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr "Propriedades do botão"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr "Cor:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr "Cor do texto:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr "Ãcone:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr "Etiqueta:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr "Escolha a ação"
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+ "Este diálogo permite-lhe definir um tÃtulo personalizado para qualquer "
+ "faixa. Pode ser útil para estações de rádio. A opção para definir o tÃtulo "
+ "personalizado também está disponÃvel no diálogo \"Adicionar localização\". O "
+ "tÃtulo estará visÃvel na coluna \"Artista\". Deverá aparecer \"artista "
+ "[personalizado]\" se o campo Artista estiver presente e se não estiver "
+ "aparece \"personalizado\"."
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Artista/Ãlbum"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Faixa n.º"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
msgstr "Adicionar à fila de reprodução"
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
msgstr "Remover da fila de reprodução"
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Recarregar detalhes"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr "Recarregar meta-dados"
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
msgstr "Remover do disco"
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Adicionar coluna"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Editar coluna"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Remover coluna"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr "Fixar grupos as deslocar"
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Agrupar por"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Nada"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Artista/Data/Ãlbum"
@@@ -1112,11 -1160,11 +1181,11 @@@ msgstr "Configurar %s
msgid "Default Audio Device"
msgstr "Dispositivo áudio pré-definido"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr "Modificou as teclas de atalho mas não gravou as alterações."
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr "Tem a certeza que quer continuar e não gravar?"
@@@ -1124,7 -1172,7 +1193,7 @@@
msgid "Adding files..."
msgstr "Adição de ficheiros..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "A iniciar..."
@@@ -1137,104 -1185,104 +1206,114 @@@ msgid "Really close the window?
msgstr "Fechar esta janela?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Vários valores]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Tecla"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Tecla"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Valor"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[Vários valores]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "A escrever detalhes..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Nome do campo"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Nome:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Os nomes não podem iniciar com : ou _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Incapaz de adicionar campo"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Já existe um campo com este nome. Tente um nome diferente."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Adicionar campo"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Remover campo"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "Utilização: deadbeef [opções] [--] [ficheiro(s)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Opções:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help ou -h Mostra a ajuda (esta mensagem) e sai\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Sai do DeadBeeF\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr ""
" --version Mostra a versão e sai\n"
"\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Inicia a reprodução\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Para a reprodução\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pausa a reprodução\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Retomar/Pausar\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1242,27 -1290,27 +1321,27 @@@ msgstr "
" --play-pause Inicia reprodução se parado, caso contrário coloca em "
"pausa\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Avança uma faixa\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Recua uma faixa\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Faixa aleatória da lista\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Junta os ficheiros à lista existente\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
@@@ -1270,12 -1318,12 +1349,12 @@@ msgstr "
" --gui PLUGIN Indica a interface a utilizar, por definição \"GTK2\"\n"
"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Grava o nome da faixa para stdout\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1286,7 -1334,7 +1365,7 @@@ msgstr "
" [l]duração, [n]úmerodafaixa, [y]ano, [c]omentário,\n"
" di[r]eitosdeautor, d[e]corrido\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1296,28 -1344,24 +1375,36 @@@ msgstr "
"\"artista - tÃtulo\"\n"
"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
- msgstr ""
- " para mais informações, consulte http://sourceforge.net/"
- "apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
+ msgstr "para mais informações, consulte %s\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Pré-definida"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Sim"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Pré-definida"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Sim"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Não"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1343,7 -1387,7 +1430,7 @@@ msgstr "
"Banda / Artista do álbum\n"
"Personalizar"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1351,7 -1395,7 +1438,7 @@@ msgstr "
"Esquerda\n"
"Direita"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1361,7 -1405,7 +1448,7 @@@ msgstr "
"Faixa\n"
"Ãlbum"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1369,7 -1413,7 +1456,7 @@@ msgstr "
"Ascendente\n"
"Descendente"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1377,14 -1421,7 +1464,7 @@@ msgstr "
"2.3 (Recomendado)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Incapaz de encontrar o ficheiro: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1397,8 -1434,8 +1477,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "Adicionar CD"
+ msgid "Add Audio CD"
+ msgstr "Adicionar CD áudio"
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1690,8 -1727,8 +1770,8 @@@ msgstr "Frequência automática (substi
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "Configurar comandos de consola"
+ msgid "Configure Custom Shell Commands"
+ msgstr "Configurar comando de consola personalizados"
#. mpgmad
#: ../translation/extra.c:99
@@@ -1707,112 -1744,117 +1787,117 @@@ msgstr "Preferir Ken emu a Satoh (surro
msgid "Enable surround"
msgstr "Ativar \"surround\""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr "[Nativo] %s"
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "O ficheiro já existe. Substituir?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Aviso de conversão"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Por favor escolha o codificador"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Erro de conversão"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "A converter..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Selecione a pasta..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Falha ao gravar definições do codificador"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
"Verifique as permissões, escolha um nome diferente ou liberte espaço em disco"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "Já existe um pré-ajuste com este nome. Escolha outro nome."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Erro"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Adicionar novo codificador"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Editar codificador"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Remover pré-ajuste"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Esta ação eliminará o pré-ajuste selecionado. Tem a certeza?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Codificadores"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Adicionar extra à cadeia DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Falha ao gravar as definições DSP"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Novo pré-ajuste DSP"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Editar pré-ajuste DSP"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "Pré-ajustes DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Pasta de destino:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "Gravar na pasta do ficheiro original"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "Manter estrutura da pasta"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Nome do ficheiro:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1822,89 -1864,89 +1907,89 @@@ msgstr "
"A extensão (ex: mp3) será adicionada automaticamente.\n"
"Deixe o campo vazio para utilizar (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Codificador:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "Pré-ajuste DSP:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Número de processos:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Formato de destino:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Manter formato original"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 bit signed int"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 bits signed int"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 bits signed int"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 bits signed int"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 bits float"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Se o ficheiro existir:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Perguntar"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Substituir"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Editar definições do codificador"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Codificador sem nome"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Extensão do ficheiro de destino:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Ex. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Linha de comandos:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1914,7 -1956,7 +1999,7 @@@ msgstr "
"Exemplo: lame - %o\n"
"%i para o ficheiro de origem, %o para o ficheiro de destino, - para stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1924,66 -1966,72 +2009,72 @@@ msgstr "
"<small>%o - nome do ficheiro de destino\n"
"%i - nome do ficheiro temporário</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Método:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Canal"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Ficheiro temporário"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Editor de detalhes</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "Editor de DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Pré-ajuste DSP sem nome"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Adicionar"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Incapaz de encontrar o ficheiro: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2021,27 -2069,27 +2112,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "Comandos personalizados"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "Editar"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "Fechar"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "Editar comando"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "Comando:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2052,17 -2100,17 +2143,17 @@@ msgstr "
"Comando de consola aleatório. Será executado na consola em que a aplicação "
"for iniciada. Pode utilizar a formatação de tÃtulo. Exemplo: xdg-open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "ID:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "Nome livre. Por exemplo: \"Os meus comandos\""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
@@@ -2070,57 -2118,57 +2161,57 @@@
msgstr ""
"ID do comando. Deve ser algo curto e único. Por exemplo \"youtube_open\". "
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "Faixa única"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "Funciona para uma faixa."
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "Várias faixas"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "Funciona para várias faixas."
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "Local"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "Funciona com ficheiros locais."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "Remoto"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "Funciona com ficheiros remotos (emissões)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr "Genérico (menu principal)"
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "Item deve aparecer no menu principal"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2131,72 -2179,72 +2222,76 @@@ msgstr "
"tÃtulo contém o caminho desta forma: \"Ficheiro/Meu comando\", em que "
"Ficheiro é o nome do menu na versão em inglês.</small>"
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "Adicionar comando"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "Eliminar"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr "Esta ação eliminará o comando de consola. Tem a certeza?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "Confirmação"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "ID não pode estar vazia e deve ser exclusiva.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "TÃtulo não pode estar vazio.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "Comando de consola não pode estar vazio.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "Valores inválidos"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "Formatos suportados"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "Todos os ficheiros (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "Abrir ficheiro(s)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "Adicionar ficheiro(s) à lista de reprodução..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "Adicionar pasta(s) à lista de reprodução..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "Ligações simbólicas"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr "help.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "Eliminar ficheiros do disco"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2204,19 -2252,19 +2299,19 @@@ msgstr "
"Os ficheiros serão eliminados. Continuar?\n"
"(Pode desativar esta opção nas definições do extra GTKUI)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "Carregar lista de reprodução"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "Outros ficheiros (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "Gravar lista de reprodução como"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "Ficheiros DeaDBeeF (*.dbpl)"
@@@ -2250,102 -2298,111 +2345,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr "Nada selecionado."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr "Substituir por..."
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr "Inserir..."
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr "Cortar"
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr "Copiar"
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr "Colar"
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr "Não é possÃvel ter vários widgets deste tipo"
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr "Bloquear movimentação"
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr "Mover separador à esquerda"
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr "Mover separador à direita"
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr "Remover separador"
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr "Mudar nome do separador"
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr "Adicionar separador"
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr "Mostrar tÃtulo das colunas"
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr "Expandir caixa em 1 item"
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr "Encolher caixa em 1 item"
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr "Homogéneo"
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr "Expandir"
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr "Preencher"
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr "O widget %s não está disponÃvel"
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr "Substituir por..."
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr "Inserir..."
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr "Cortar"
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr "Copiar"
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr "Colar"
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr "Não é possÃvel ter vários widgets deste tipo"
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr "Bloquear movimentação"
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr "Mover separador à esquerda"
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr "Mover separador à direita"
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr "Remover separador"
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr "Mudar nome do separador"
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr "Adicionar separador"
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr "Mostrar tÃtulo das colunas"
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr "Expandir caixa em 1 item"
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr "Encolher caixa em 1 item"
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr "Homogéneo"
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr "Expandir"
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr "Preencher"
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr "Configurar botão"
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr "Vozes:"
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr "Editar lista de reprodução"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr "Mudar nome da lista de reprodução"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr "Remover lista de reprodução"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr "Adicionar lista de reprodução"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr "Nome"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr "Explorador de listas de reprodução"
diff --combined po/pt_BR.po
index a6ff2a5,3d074b6..d4a7555
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@@ -10,9 -10,9 +10,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
"deadbeef-player/language/pt_BR/)\n"
"Language: pt_BR\n"
@@@ -21,17 -21,17 +27,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Sobre o DeaDBeef %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "Registro de alterações - DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Tradutores do DeaDBeeF"
@@@ -88,44 -88,44 +94,52 @@@ msgstr "Pré-amplificação zero
msgid "Zero Bands"
msgstr "Bandas a zero"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Predefinições"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 dia %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dias %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Parado | %d faixas | %s tempo total de reprodução"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Estéreo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Pausado | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -133,748 -133,775 +147,779 @@@ msgstr "
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d faixas | %s tempo total de "
"reprodução"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Nova lista"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Nova lista (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Falha ao ler o arquivo de ajuda"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Falha ao carregar o arquivo de ajuda"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Alerta"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Arquivo"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Abrir arquivos(s)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Adicionar arquivo(s)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Adicionar pasta(s)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Adicionar local"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nova lista de reprodução"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Carregar lista de reprodução"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Salvar lista de reprodução"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Sair"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Editar"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Limpar"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Selecionar tudo"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Desmarcar tudo"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Inverter seleção"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Seleção"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Remover"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Cortar"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Procurar"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "TÃtulo"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Número da faixa"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Ãlbum"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artista"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Data"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Aleatória"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Personalizar"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Preferências"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Ver"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Barra de status"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Equalizador"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Reprodução"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Ordem"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Linear"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Embaralhar faixas"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Embaralhar álbuns"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Repetição"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Rolagem segue a reprodução"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Cursor segue a reprodução"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Parar após a atual"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Ir para a faixa atual"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "Aj_uda"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "Registro de _alterações"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Sobre"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Tradutores"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Pesquisar"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Parar"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Reproduzir"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pausar"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Anterior "
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Próxima"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Reprodução aleatória"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Sobre"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Sair"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Ajuda"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Propriedades da faixa"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Configuração"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Aplicar"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Fechar"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadados"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Propriedades"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "TÃtulo:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Digite o novo tÃtulo da coluna aqui"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Tipo:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Ãndice de itens"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Em reprodução"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Capa do álbum"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Artista - Ãlbum"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Duração"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Número da faixa"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Banda / Artista do álbum"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Formato:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Alinhamento:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Esquerda"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Direita"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Cancelar"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Plugin de saÃda:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Dispositivo de saÃda:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Sempre converter áudio de 8 bits para 16 bits"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Som"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Modo de normalização:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Desabilitado"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Faixa"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Ajustar a normalização com o nÃvel de pico"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Pré-amplificação da normalização:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Pré-amplificação global:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Adicionar arquivos pela linha de comando (ou gerenciador de arquivos) a esta "
"lista de reprodução:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Continuar a sessão anterior ao iniciar"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Não adicionar de arquivos ao adicionar pastas"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Reprodução"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Configurar"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Predefinição de corrente do DSP"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Carregar"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Fechar minimiza para a área de notificação"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Ocultar o Ãcone na área de notificação"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Taxa de atualização da interface (vezes por segundo):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Texto na barra de tÃtulo durante a reprodução:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Texto na barra de tÃtulo quando parado:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "Plugin da interface gráfica (mudança requer reinÃcio):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Ocultar item \"Excluir do disco\" do menu de contexto"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Autonomear listas de reprodução ao adicionar uma única pasta"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Sobrepujar"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Primeiro plano"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Segundo plano"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Cores das barras volume/pesquisa"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Meio"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Claro"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Escuro"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Base"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Texto"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Cores do separador"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"Sobrepujar (perde o tema GTK na visão em árvore, mas acelera a renderização)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Linha par"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Linha Ãmpar"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Linha selecionada"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Texto selecionado"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Cursor"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Cores da lista de reprodução"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Cores"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Habilitar servidor proxy"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Endereço do servidor proxy:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Porta do servidor proxy:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Tipo de proxy:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Nome de usuário do proxy:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Senha do proxy:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Rede"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -882,122 -909,128 +927,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Versão: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Direitos autorais"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Plugins"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Formato"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Ascendente"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Descendente"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Selecionar plugin do DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Plugin"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Configuração do editor de etiquetas"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Escrever ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Escrever ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Escrever APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Remover ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Remover ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Remover APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "Versão ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Recomendado)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "Codificação de caracteres ID3v1 (padrão é iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Escrever ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1005,91 -1038,100 +1056,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Artista / Ãlbum"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Nº da faixa"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Colocar na fila da lista de reprodução"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Remover da fila da lista de reprodução"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Recarregar metadados"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Remover do disco"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Adicionar coluna"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Editar coluna"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Remover coluna"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Agrupar por"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Nenhum"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Artista/Data/Ãlbum"
@@@ -1106,11 -1148,11 +1170,11 @@@ msgstr "Configurar %s
msgid "Default Audio Device"
msgstr "Dispositivo de áudio padrão"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1118,7 -1160,7 +1182,7 @@@
msgid "Adding files..."
msgstr "Adicionando arquivos..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Inicializando..."
@@@ -1131,142 -1173,142 +1195,152 @@@ msgid "Really close the window?
msgstr "Deseja realmente fechar esta janela?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Valores múltiplos]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Chave"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Chave"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Valor"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Escrevendo etiquetas..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Nome:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Os nomes dos campos não devem começar com : ou _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Incapaz de adicionar campo"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Um campo com esse nome já existe. Por favor, tente outro nome."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Adicionar campo"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Remover campo"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Opções:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help ou -h Imprime a ajuda (esta mensagem) e sai\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Fecha o DeaDBeeF\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Imprime informações da versão e sai\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Inicia a reprodução\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Para a reprodução\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pausa a reprodução\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Pausa/reinicia\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
" --play-pause Inicia a reprodução se parado, senão pausa/reinicia\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Próxima música na lista de reprodução\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Música anterior na lista de reprodução\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Música aleatória na lista de reprodução\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr ""
" --queue Acrescenta arquivos(s) à lista de reprodução "
"existente\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Imprime o nome da faixa para a saÃda padrão\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1277,7 -1319,7 +1351,7 @@@ msgstr "
" [l]duração, [n]úmero da faixa, [y]ano, [c]omentário,\n"
" di[r]eitos autorais, tempo d[e]corrido\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1286,29 -1328,24 +1360,36 @@@ msgstr "
" ex.: --nowplaying \"%%a - %%t\" deve imprimir\n"
" \"artista - tÃtulo\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " para mais informações, veja:\n"
- "http://sourceforge.net/apps/mediawiki/deadbeef/index.php?"
- "title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Padrão"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Sim"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Padrão"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Sim"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Não"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1334,7 -1371,7 +1415,7 @@@ msgstr "
"Banda / Artista do álbum\n"
"Personalizar"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1342,7 -1379,7 +1423,7 @@@ msgstr "
"Esquerda\n"
"Direita"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1352,7 -1389,7 +1433,7 @@@ msgstr "
"Faixa\n"
"Ãlbum"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1360,7 -1397,7 +1441,7 @@@ msgstr "
"Ascendente\n"
"Descendente"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1368,14 -1405,7 +1449,7 @@@ msgstr "
"2.3 (Recomendado)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Não foi possÃvel encontrar o arquivo pixmap: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1388,7 -1418,7 +1462,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1681,7 -1711,7 +1755,7 @@@ msgstr "Taxa de amostragem automática
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1698,35 -1728,40 +1772,40 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "O arquivo já existe. Sobrescrever?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Alerta do conversor"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Selecione o codificador, por favor"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Erro do conversor"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Convertendo..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Selecionar pasta..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Falha ao salvar predefinição do codificador"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1734,78 -1769,78 +1813,78 @@@ msgstr "
"Verifique as permissões da pasta de predefinições, tente com um tÃtulo "
"diferente ou libere algum espaço no disco"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
"Uma predefinição com o mesmo nome já existe. Tente um tÃtulo diferente."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Erro"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Adicionar novo codificador"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Editar codificador"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Remover predefinição"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Esta ação irá excluir a predefinição selecionada. Tem certeza?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Codificadores"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Adicionar plugin à corrente do DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Falha ao salvar predefinição do DSP"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Nova predefinição do DSP"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Editar predefinição do DSP"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "Predefinições do DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Pasta de saÃda:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Nome do arquivo de saÃda:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1815,89 -1850,89 +1894,89 @@@ msgstr "
"A extensão (ex. .mp3) será adicionada automaticamente.\n"
"Deixe o campo vazio para o padrão (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Codificador:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "Predefinição do DSP:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Número de linhas de execução"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Formato da amostra de saÃda:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Manter o formato original"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "Inteiro de 8 bits com sinal"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "Inteiro de 16 bits com sinal"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "Inteiro de 24 bits com sinal"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "Inteiro de 32 bits com sinal"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 bits flutuante"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Quando o arquivo existir:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Perguntar"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Sobrescrever"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Editar predefinição do codificador"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Codificador sem tÃtulo"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Extensão do arquivo de saÃda:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Ex. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Linha de comando:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1908,7 -1943,7 +1987,7 @@@ msgstr "
"%i para arquivo de entrada, %o para arquivo de saÃda, - para entrada padrão "
"(stdin)"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1918,66 -1953,72 +1997,72 @@@ msgstr "
"<small>%o - nome do arquivo de saÃda\n"
"%i - nome do arquivo de entrada temporário</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Método:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Pipe"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Arquivo temporário"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Editor de etiquetas</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "Editor de predefinições do DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Predefinição do DSP sem tÃtulo"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Adicionar"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Não foi possÃvel encontrar o arquivo pixmap: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2015,27 -2056,27 +2100,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2044,74 -2085,74 +2129,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2119,90 -2160,90 +2204,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2229,102 -2270,111 +2318,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/ro.po
index aea8c72,b84c40d..a9708a0
--- a/po/ro.po
+++ b/po/ro.po
@@@ -4,16 -4,17 +4,23 @@@
#
# Translators:
# Arthur Țițeică <arthur at psw.ro>, 2013
- # roentgen <arthur.titeica at gmail.com>, 2013
+ # Arthur Țițeică <arthur.titeica at gmail.com>, 2013
+ # Mișu Moldovan <dumol at l10n.ro>, 2014
# Mișu Moldovan <dumol at xfce.org>, 2012
- # roentgen <arthur.titeica at gmail.com>, 2013
+ # Arthur Țițeică <arthur.titeica at gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-08-02 12:24+0000\n"
+ "Last-Translator: Mișu Moldovan <dumol at l10n.ro>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Romanian (http://www.transifex.com/projects/p/deadbeef-player/"
"language/ro/)\n"
"Language: ro\n"
@@@ -23,17 -24,17 +30,17 @@@
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
"2:1));\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Despre DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "Istoricul modificărilor DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Traducători DeaDBeeF"
@@@ -48,7 -49,7 +55,7 @@@ msgstr "Fișiere cu presetări DeaDBee
#: ../plugins/gtkui/eq.c:187
msgid "Load DeaDBeeF EQ Preset..."
- msgstr "Încarcă presetări DeaDBeeF EQ..."
+ msgstr "Încărcare presetări DeaDBeeF EQ..."
#: ../plugins/gtkui/eq.c:191
msgid "DeaDBeeF EQ presets (*.ddbeq)"
@@@ -68,11 -69,11 +75,11 @@@ msgstr "Salvare presetări
#: ../plugins/gtkui/eq.c:329
msgid "Load Preset"
- msgstr "Încarcă presetări"
+ msgstr "Încărcare presetări"
#: ../plugins/gtkui/eq.c:337
msgid "Import Foobar2000 Preset"
- msgstr "Import de presetări Foobar2000"
+ msgstr "Import de presetări Foobar2000..."
#: ../plugins/gtkui/eq.c:362
msgid "Enable"
@@@ -90,795 -91,820 +97,832 @@@ msgstr "Zero preamp
msgid "Zero Bands"
msgstr "Zero benzi"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Presetări"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "o zi %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d zile %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Oprit | %d piese | %s durată totală"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Pauză | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d piese | %s durată totală"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Listă de redare nouă"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Listă de redare nouă (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Listă de redare cu file"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Listă de redare"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "Separator (sus și jos)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "Separator (stânga și dreapta)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "File de liste de redare"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Proprietățile selecției"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Afișare copertă de album"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "Scop"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "Spectru"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Buton"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr "Bară de căutare"
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr "Controale de redare"
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr "Bară de volum"
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr "Voci sintetizate"
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Nu s-a putut citi fișierul ce conține ajutorul"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Nu s-a putut încărca fișierul ce conține ajutorul"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- "În acest moment lectorul rulează sarcini în fundal. Dacă renunți acum, "
- "sarcinile vor fi anulate sau întrerupte. Acest lucru poate cauza pierderi de "
- "date."
+ "Playerul are în lucru unele sarcini în fundal. Dacă îl închideți acum, "
+ "aceste sarcini vor fi întrerupte sau se vor pierde. E posibil să pierdeți "
+ "anumite date."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "Dorești în continuare să renunți?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Avertizare"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Fișier"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
- msgstr "_Deschide fișier(e)"
+ msgstr "_Deschidere fișiere"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
- msgstr "Adaugă fișier(e)"
+ msgstr "Adăugare fișiere"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
- msgstr "Adaugă dosar(e)"
+ msgstr "Adăugare directoare"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
- msgstr "Adaugă locație"
+ msgstr "Adăugare link"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Listă de redare nouă"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
- msgstr "Încarcă listă de redare"
+ msgstr "Încărcare listă de redare"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
- msgstr "Salvează lista de redare"
+ msgstr "Salvare listă de redare"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Ieșire"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Editare"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Golire"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
- msgstr "Selectează tot"
+ msgstr "Selectare completă"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
- msgstr "Deselectează tot"
+ msgstr "Deselectare completă"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
- msgstr "Inversează selecția"
+ msgstr "Inversare a selecției"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Selecție"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
- msgstr "Șterge"
+ msgstr "Ștergere"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
- msgstr "Decupează"
+ msgstr "Decupare"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
- msgstr "_Caută"
+ msgstr "_Căutare"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
- msgstr "Sortează după"
+ msgstr "Sortare după"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Titlu"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Numărul piesei"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artist"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Dată"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Aleatoare"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
- msgstr "Personalizat"
+ msgstr "Personalizare..."
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Preferințe"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Vizualizare"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Bară de stare"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Egalizator"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "Mod design"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Redare"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Ordine"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Liniară"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Piese amestecate"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Albume amestecate"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Repetare"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Repetare pentru listă"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Repetare pentru piesa curentă"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Fără repetare"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Lista se derulează la redare"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Selecția urmează redarea"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
msgstr "Oprire după piesa curentă"
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr "Oprire după albumul curent"
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Salt la piesa curentă"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Ajutor"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Istoric"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Despre"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Traducători"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
- msgstr "Caută"
+ msgstr "Căutare"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Stop"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Redare"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pauză"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "ÃŽnapoi"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "ÃŽnainte"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Aleator"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Despre"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Ieșire"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Ajutor"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Proprietățile piesei"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "Locație:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Opțiuni"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Aplică"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "ÃŽn_chide"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadate"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Proprietăți"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Titlu:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
- msgstr "Introdu aici un nou titlu pentru coloană"
+ msgstr "Introduceți aici un nou titlu pentru coloană"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Tip:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
- msgstr "Index elementului"
+ msgstr "Index de elemente"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "ÃŽn redare"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Copertă album"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Artist - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Durată"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Numărul piesei"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
- msgstr "Formație / Artist album"
+ msgstr "Formație / Album Artist"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Format:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Aliniere:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Stânga"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Dreapta"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Renunță"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
- msgstr "Extensie pentru ieșire:"
+ msgstr "Modul de ieșire audio:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Dispozitiv de ieșire audio:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
- msgstr "Transformă întotdeauna audio pe 8 biți în 16 biți"
+ msgstr "Convertire la 16-biți pentru piesele audio de 8-biți"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr "Transformă întotdeauna audio pe 16 biți în 24 de biți"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Sunet"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
- msgstr "Mod replaygain:"
+ msgstr "Mod ReplayGain:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
- msgstr "Dezactivează"
+ msgstr "Dezactivat"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Piesă"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
- msgstr "Scalare replaygain pentru vârfuri"
+ msgstr "Scalare pentru vârfurile ReplayGain"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
- msgstr "Preamplificare replaygain:"
+ msgstr "Preamplificare ReplayGain"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Preamplificare globală:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
- msgstr ""
- "Folosește această listă pentru fișierele adăugate din linia de comandă (sau "
- "manager de fișiere):"
+ msgstr "Fișierele adăugate extern intră în lista de redare:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
- msgstr "La pornire se încarcă sesiunea precedentă"
+ msgstr "La pornire se reîncarcă sesiunea precedentă"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
- msgstr "La adăugarea de dosare nu se adaugă fișiere din arhive"
+ msgstr "La adăugarea de directoare nu se adaugă fișiere din arhive"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "Resetare automată pentru \"Oprire după piesa curentă\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr "Opțiunea de oprire după piesa curentă nu persistă"
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr "Opțiunea de oprire după albumul curent nu persistă"
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Redare"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Configurare"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Presetări lanț DSP:"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "Înca_rcă"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
- msgstr "DSP"
+ msgstr "Procesare"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
- msgstr "Închiderea minimizează în zona de notificare"
+ msgstr "Minimizare în zona de notificare la închiderea ferestrei"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
- msgstr "Ascunde pictograma din zona de notificare"
+ msgstr "Fără iconiță în zona de notificare"
+
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr "Detecție automată pentru codarea japoneză SHIFT-JIS"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "Activează detecția și recodarea pentru CP1251 (Rusia)"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Activează detecția si recodarea pentru CP936 (China)"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Frecvență de reîmprospătare a interfeței (per secundă):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Text în bara de titlu la redare:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Text în bara de titlu în pauză:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
- msgstr "Extensie pentru GUI (modificările necesită repornire):"
+ msgstr "Modul GUI (modificările necesită repornire):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr "Lector"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr "ÃŽnchide listele de redare cu butonul de clic mijloc"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr "Desenează piesa care rulează folosind un font îngroșat"
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Ascunde \"Ștergere de pe disc\" în meniul contextual"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr "Fără „Ștergere de pe disc†în meniul contextual"
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
- msgstr "Denumire automată pentru liste la adăugarea unui singur dosar"
+ msgstr "Denumire automată pentru liste la adăugarea unui singur director"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr "Dimensionare automată a coloanelor pentru a se încadra în fereastră"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "GUI/Altele"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Suprascriere"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Prim-plan"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Fundal"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Culorile barelor de redare și volum"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "ÃŽntre"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Deschis"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "ÃŽnchis"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Bază"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Text"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
- msgstr "Culorile filelor"
+ msgstr "Culorile taburilor"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
- "Suprascriere (se pierde tema \"treeview\" GTK, dar se accelerează randarea)"
+ "Suprascriere (se pierde tema „treeview†GTK, dar se accelerează randarea)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Rând par"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Rând impar"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Rând selectat"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Text selectat"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
- msgstr "Cursor"
+ msgstr "Selecție"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Culorile listei de redare"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Culori"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
- msgstr "Folosește server proxy"
+ msgstr "Activare server proxy"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Adresă server proxy:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Port server proxy:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Tip proxy:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Utilizator proxy:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Parolă proxy:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "HTTP User Agent:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "Editează mapările Content-Type"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Rețea"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr "Acceleratori folosiți:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr "Acțiune:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<Nesetat>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr "Combinație de taste:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Accelerator global"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -890,122 -916,128 +934,128 @@@ msgstr "
"Modificările NU vor fi salvate\n"
"dacă nu vei apăsa Aplică."
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr "_Implicit"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "Acceleratori"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Versiune:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
- msgstr "Copyright"
+ msgstr "Drepturi de autor"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
- msgstr "Extensii"
+ msgstr "Module"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr "Titlu personalizat"
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "Grupează după ..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "Sortează după ..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Format"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Crescătoare"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Descrescătoare"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
- msgstr "Selectare extensie DSP"
+ msgstr "Selectare modul DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
- msgstr "Extensie"
+ msgstr "Modul"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Opțiuni pentru scrierea etichetelor"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Scrie ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Scrie ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Scrie APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Șterge ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Șterge ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Șterge APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "Versiune ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (recomandată)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
- msgstr "Cod de caractere pentru ID3v1 (implicit iso8859-1)"
+ msgstr "Codare ID3v1 (implicit iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Scrie ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "Mapăre Content-Type"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1017,91 -1049,106 +1067,110 @@@ msgstr "
"pot avea tipul de conținut \"audio/x-mpeg\", și trebuie decodate de către "
"extensia \"stdmpg\" proprie DeaDBeeF, sau de către extensia \"ffmpeg\"."
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "Resetare la setări implicite"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "Tip de conținut:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "Extensii:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr "Proprietățile butonului"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr "Culoare:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr "Culoare text:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr "Pictogramă:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr "Etichetă:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr "Alege acțiune"
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+ "Acest dialog vă permite să alegeți un nume personalizat pentru orice pistă, "
+ "ceea ce poate fi folositor la redarea stațiilor radio. O opțiune pentru a "
+ "alege un titlu personalizat este prezentă È™i în dialogul „AdăugaÈ›i un linkâ€. "
+ "Titlul va fi vizibil în coloanele ce afișează câmpul „Artist†în formatul "
+ "„[personalizat] artist†dacă este prezent câmpul „Artist†sau doar "
+ "„personalizatâ€, dacă nu e prezent."
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Artist / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Nr. piesă"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Adaugă în coada de redare"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr "Adăugare în coada de redare"
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Șterge din coada de redare"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr "Ștergere din coada de redare"
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Reîncarcă metadate"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr "Reîncarcare metadate"
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Șterge de pe disc"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr "Ștergere de pe disc"
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
- msgstr "Adaugă coloană"
+ msgstr "Adăugare coloană"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
- msgstr "Editează coloană"
+ msgstr "Editare coloană"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
- msgstr "Șterge coloană"
+ msgstr "Ștergere coloană"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
- msgstr ""
+ msgstr "Fixează grupurile la defilare"
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Grupează după"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Fără"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Artist/Dată/Album"
@@@ -1118,20 -1165,20 +1187,20 @@@ msgstr "Configurare %s
msgid "Default Audio Device"
msgstr "Dispozitiv audio implicit"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
"Ai modificat setările pentru taste rapide dar nu ai salvat schimbările."
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr "Ești sigur că vrei să continui fără să salvezi?"
#: ../plugins/gtkui/progress.c:56
msgid "Adding files..."
- msgstr "Adaugă fișiere..."
+ msgstr "Adăugare fișiere..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Inițializare..."
@@@ -1141,105 -1188,105 +1210,115 @@@ msgstr "Ați modificat datele acestei p
#: ../plugins/gtkui/trkproperties.c:170
msgid "Really close the window?"
- msgstr "Sigur dorești să închizi fereastra?"
+ msgstr "Sigur doriți să închideți fereastra?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
- msgstr "[Valori multiple] "
+ msgstr "[Valori multiple]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Cheie"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Cheie"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Valoare"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[Valori multiple]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Se scriu etichetele..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Nume câmp"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Nume:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Numele câmpurilor nu pot începe cu : sau _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
- msgstr "Nu se poate adăuga câmpul"
+ msgstr "Nu s-a putut adăuga câmpul"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
- msgstr "Un câmp cu acest nume deja există, te rog încearcă un alt nume."
+ msgstr "Un câmp cu acest nume există deja, încercați să-l redenumiți."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
- msgstr "Adaugă câmp"
+ msgstr "Adăugare câmp"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
- msgstr "Șterge câmp"
+ msgstr "Ștergere câmp"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "Utilizare: deadbeef [opțiuni] [--] [fișier(e)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Opțiuni:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help sau -h Arată acest mesaj de ajutor și ieși\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
- msgstr " --quit Ieșire din lector\n"
+ msgstr " --quit Ieșire din player\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
- msgstr " --version Afișează detaliile versiunii și ieși\n"
+ msgstr " --version Arată detaliile versiunii și ieși\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Pornește redarea\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Oprește redarea\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pune pauză redării\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Comută starea de pauză\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1247,84 -1294,80 +1326,92 @@@ msgstr "
" --play-pause Pornește redarea dacă e cazul sau comută starea de "
"pauză\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Piesa următoare în lista de redare\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Piesa precedentă în lista de redare\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Piesă aleatoare din lista de redare\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Adaugă fișiere la lista de redare curentă\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- " --gui EXTENSIE Precizează ce extensie GUI să fie utilizată, implicit "
+ " --gui MODUL Precizează ce modul GUI să fie utilizat, implicit "
"\"GTK2\"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
" --nowplaying FMT Arată în ieșirea standard numele formatat al piesei\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
" copy[r]ight, [e]lapsed\n"
msgstr ""
- " Sintaxă FMT prefixată cu %%: [a]rtist, [t]itlu, al[b]"
- "um,\n"
- " [l]ungime, [n]umăr piesă, [y] pentru an, [c]"
- "omentariu,\n"
+ " Sintaxă FMT prefixată cu %%: [a]rtist, [t]itlu, "
+ "al[b]um,\n"
+ " [l]ungime, [n]umăr piesă, [y] pentru an, "
+ "[c]omentariu,\n"
" d[r]epturi de autor, durată r[e]dată\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
"- title\"\n"
msgstr ""
" de ex.: --nowplaying \"%%a - %%t\" va rezulta în "
- "\"artist - titlu\"\n"
+ "\"artist - titlu\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
- msgstr ""
- " pentru mai multe detalii vezi http://sourceforge.net/"
- "apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
+ msgstr " pentru mai multe detalii, consultați %s\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Implicit"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Da"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Implicit"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Da"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Nu"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1350,7 -1393,7 +1437,7 @@@ msgstr "
"Formație / Artist Album\n"
"Personalizat"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1358,25 -1401,25 +1445,25 @@@ msgstr "
"Stânga\n"
"Dreapta"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
"Album"
msgstr ""
- "Dezactivat\n"
+ "Dezactivare\n"
"Piesă\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- "Crescător\n"
- "Descrescător"
+ "Ascendent\n"
+ "Descendent"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1384,32 -1427,25 +1471,25 @@@ msgstr "
"2.3 (Recomandat)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Nu s-a putut găsi fișierul pixmap: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
"package, or specify path to freepats.cfg in the plugin settings."
msgstr ""
- "wildmidi: nu s-a găsit fișierul de configurare freepats. Instalează pachetul "
- "timidity-freepats sau introdu calea către freepats.cfg în opțiunile "
- "extensiei."
+ "wildmidi: nu s-a găsit fișierul de configurare freepats. Instalați pachetul "
+ "timidity-freepats sau specificați calea către freepats.cfg în opțiunile "
+ "modulului."
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "Adaugă CD audio"
+ msgid "Add Audio CD"
+ msgstr "Adăugați un CD audio"
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
- msgstr "Caută pe Last.fm"
+ msgstr "Căutare pe Last.fm"
#. ALSA output plugin
#: ../translation/extra.c:6
@@@ -1435,7 -1471,7 +1515,7 @@@ msgstr "Activare Scrobbler
#: ../translation/extra.c:12
msgid "Disable nowplaying"
- msgstr "Dezactivare nowplaying"
+ msgstr "Dezactivare „nowplayingâ€"
#: ../translation/extra.c:13
msgid "Username"
@@@ -1451,21 -1487,21 +1531,21 @@@ msgstr "URL Scrobble
#: ../translation/extra.c:16
msgid "Prefer Album Artist over Artist field"
- msgstr "Preferă câmpul Artist album în locul cămpului Artist"
+ msgstr "Preferă câmpul Artist al albumului"
#. OSS output plugin
#: ../translation/extra.c:18
msgid "Device file"
- msgstr "Fișier dispozitiv"
+ msgstr "Fișierul dispozitivului"
#: ../translation/extra.c:19
msgid "OSS4 samplerate bug workaround"
- msgstr "Soluție alternativă pentru hiba ratei de eșantionare OSS4"
+ msgstr "Soluție alternativă pentru problema ratei de eșantionare OSS4"
#. Album Artwork plugin
#: ../translation/extra.c:21
msgid "Cache update period (hr)"
- msgstr "Perioada de actualizare pentru cache (ore)"
+ msgstr "Perioadă de actualizare pentru cache (ore)"
#: ../translation/extra.c:22
msgid "Fetch from embedded tags"
@@@ -1473,19 -1509,19 +1553,19 @@@ msgstr "Extrage din etichetele încorpo
#: ../translation/extra.c:23
msgid "Fetch from local folder"
- msgstr "Extrage din dosarul local"
+ msgstr "Extrage din directorul local"
#: ../translation/extra.c:24
msgid "Local cover file mask"
- msgstr "Mască pentru fișierele locale cu coperte"
+ msgstr "Mască pentru fișierele local cu coperte"
#: ../translation/extra.c:25
msgid "Fetch from last.fm"
- msgstr "Extrage din Last.fm"
+ msgstr "Extrage de la Last.fm"
#: ../translation/extra.c:26
msgid "Fetch from albumart.org"
- msgstr "Extrage din albumart.org"
+ msgstr "Extrage de la albumart.org"
#: ../translation/extra.c:27
msgid "Scale artwork towards longer side"
@@@ -1502,11 -1538,11 +1582,11 @@@ msgstr "Preferă CD-Text înaintea CDDB
#: ../translation/extra.c:31
msgid "CDDB url (e.g. 'freedb.org')"
- msgstr "Server CDDB (de ex. 'freedb.org')"
+ msgstr "Server CDDB (de ex. „freedb.orgâ€)"
#: ../translation/extra.c:32
msgid "CDDB port number (e.g. '888')"
- msgstr "Port CDDB (de ex. '888')"
+ msgstr "Port CDDB (de ex. „888â€)"
#: ../translation/extra.c:33
msgid "Prefer CDDB protocol over HTTP"
@@@ -1519,11 -1555,11 +1599,11 @@@ msgstr "Activează suportul pentru imag
#. DUMB module player plugin
#: ../translation/extra.c:36
msgid "Resampling quality (0..2, higher is better)"
- msgstr "Calitatea reeșantionării (0..2, mai mare e mai bine)"
+ msgstr "Calitatea reeșantionării (0-2, 2 e calitate maximă)"
#: ../translation/extra.c:37
msgid "8-bit output (default is 16)"
- msgstr "Ieșire pe 8-biți (implicit este 16)"
+ msgstr "Output 8-bit (implicit e 16)"
#. Game_Music_Emu decoder plugin
#: ../translation/extra.c:39
@@@ -1557,8 -1593,7 +1637,7 @@@ msgstr "Execută gtk_init cu --sync (mo
#: ../translation/extra.c:47
msgid "Add separators between plugin context menu items"
- msgstr ""
- "Adaugă separatori între elementele din meniul contextual al extensiilor"
+ msgstr "Adaugă separatori între elementele modulelor din meniul contextual"
#. OSD Notify plugin
#: ../translation/extra.c:49
@@@ -1676,7 -1711,7 +1755,7 @@@ msgstr "Codec
#. FFmpeg deocder plugin
#: ../translation/extra.c:89
msgid "File Extensions (separate with ';')"
- msgstr "Extensii de fișiere (separate prin ';')"
+ msgstr "Extensii de fișiere (separate prin ;)"
#. Converter GUI
#: ../translation/extra.c:91
@@@ -1698,8 -1733,8 +1777,8 @@@ msgstr "Rată de eÈ™antionare automatÄ
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "Configurare comenzi shell personalizate"
+ msgid "Configure Custom Shell Commands"
+ msgstr "Comenzi shell personalizate…"
#. mpgmad
#: ../translation/extra.c:99
@@@ -1715,113 -1750,118 +1794,118 @@@ msgstr "Preferă Ken emu înaintea Sato
msgid "Enable surround"
msgstr "Activare surround"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr "[Inclus] %s"
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
- msgstr "Fișierul există deja. Îl suprascrii?"
+ msgstr "Fișierul există deja. Doriți să îl suprascrieți?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Avertizare de la convertor"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Selectați un codor"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Eroare de convertire"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
- msgstr "Conversie..."
+ msgstr "ÃŽn convertire..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
- msgstr "Selectează dosar..."
+ msgstr "Selectați un director..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Nu s-au putut salva presetările codorului"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- "Verificați drepturile pentru dosarul cu presetări, alegeți un alt titlu sau "
- "eliberați mai mult spațiu pe disc"
+ "Verificați drepturile pentru directorul cu presetări, alegeți un alt titlu "
+ "sau eliberați mai mult spațiu pe disc"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "Există deja o presetare cu acest nume. Alegeți un alt titlu."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Eroare"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
- msgstr "Adaugă codor nou"
+ msgstr "Adăugare codor nou"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Editare codor"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Ștergere codor"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
- msgstr "Această acțiune va șterge predefiniția selectată. Ești sigur?"
+ msgstr "Această acțiune va șterge predefiniția selectată. Sigur doriți asta?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Codoare"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
- msgstr "Adăugare extensie în lanțul DSP"
+ msgstr "Adaugare modul în lanțul DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Nu s-a putut salva predefiniția DSP"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Nouă presetare DSP"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Editare presetare DSP"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "Presetări DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
- msgstr "Dosar cu rezultate:"
+ msgstr "Director cu rezultate:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
- msgstr "Scrie în dosarul pieselor originale"
+ msgstr "Scrie în directorul pieselor originale"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
- msgstr "Păstrează structura de dosare"
+ msgstr "Păstrează structura de directoare"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Nume fișier rezultat:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1829,91 -1869,91 +1913,91 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
"Extensia (de ex. .mp3) va fi adăugată automat.\n"
- "Lasă câmpul gol pentru valoarea implicită (%a - %t)."
+ "Lăsați câmpul gol pentru valoarea implicită (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Codor:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "Presetare DSP:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Număr de fire de execuție:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Eșantionarea finală:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Păstrează formatul sursei"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 bit signed int"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 bit signed int"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 bit signed int"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 bit signed int"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 bit float"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Dacă fișierul există:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Întreabă"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Suprascrie"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Editare presetare codor"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Codor fără nume"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Extensie fișier rezultat:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "De ex. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Linie de comandă:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1923,7 -1963,7 +2007,7 @@@ msgstr "
"Exemplu: lame - %o\n"
"%i pentru fișierul input, %o pentru fișierul rezultat, - pentru stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1933,65 -1973,71 +2017,71 @@@ msgstr "
"<small>%o - nume fișier rezultat\n"
"%i - nume fișier temporar de input</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Metodă:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
- msgstr "Pipe"
+ msgstr "Conector „pipeâ€"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Fișier temporar"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Scriere de etichete</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "Editor de presetări DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Presetare DSP fără nume"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
- msgstr "Adaugă"
+ msgstr "Adăugare"
+
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Nu s-a putut găsi fișierul pixmap: %s"
#: ../plugins/converter/converter.glade.h:12
msgid ""
@@@ -2022,7 -2068,7 +2112,7 @@@ msgid "
"Pipe\n"
"Temporary file"
msgstr ""
- "Pipe\n"
+ "Pipă\n"
"Fișier temporar"
#: ../plugins/shellexecui/interface.c:46
@@@ -2030,27 -2076,27 +2120,27 @@@
msgid "Custom Shell Commands"
msgstr "Comenzi shell personalizate"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "Editare"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "ÃŽnchide"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
- msgstr "Editează comanda"
+ msgstr "Editare coloană"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "Comandă:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2062,149 -2108,152 +2152,156 @@@ msgstr "
"fost pornit DeaDBeeF. Se poate utiliza formatarea titlului. De exemplu: xdg-"
"open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
- msgstr "ID:"
+ msgstr "Nume:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
- msgstr "Nume arbitrar, de exemplu \"Comanda mea shell\""
+ msgstr "Nume arbitrar, de exemplu „Comanda mea shellâ€"
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- "ID comendă, în mod obișnuit ar trebui să fie ceva scurt, de exemplu "
+ "Numele comenzii, în mod obișnuit ar trebui să fie ceva scurt, de exemplu "
"\"youtube_open\". Trebuie să fie unic."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "Piese unice"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "Funcționează doar pentru o piesă unică."
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "Piese multiple"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "Funcționează pentru piese multiple."
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "Local"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "Funcționează pentru fișiere locale."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "La distanță"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
- msgstr "Funcționează pentru linkuri la distanță (de ex. fluxuri http://)"
+ msgstr "Funcționează pentru linkuri la distanță (de ex. fluxuri HTTP)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
- msgstr ""
+ msgstr "Generic (în meniul principal)"
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "Elementul va apărea în meniul principal"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
"contains the menu path like this: \"File/My Command\", where File is the "
"menu name in the English version.</small>"
msgstr ""
+ "<small>Dacă doriți să adăugați comanda în meniul principal, asigurați-vă că "
+ "titlul conÈ›ine calea din meniu, de exemplu „File/Comanda Meaâ€, unde «File» "
+ "este numele în engleză al elementului din meniu.</small>"
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
- msgstr "Adaugă comandă"
+ msgstr "Adăugare coloană"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
- msgstr "Șterge"
+ msgstr "Ștergere"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
- msgstr "Această acțiune va șterge comanda shell selectată. Ești sigur?"
+ msgstr "Această acțiune va șterge comanda shell selectată. Sigur doriți asta?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
- msgstr "Confirmă ștergerea"
+ msgstr "Confirmare eliminare"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
- msgstr "ID trebuie să fie completat și trebuie să fie unic.\n"
+ msgstr "Numele nu poate fi gol și trebuie să fie unic.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
- msgstr "Titlul trebuie să fie completat.\n"
+ msgstr "Titlu nu poate fi gol.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
- msgstr "Comanda shell trebuie să fie completată.\n"
+ msgstr "Comanda shell nu poate fi goală.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "Valori nevalide"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "Formate de sunet suportate"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "Toate fișierele (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "Deschide fișier(e)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "Adaugă fișier(e) în listă..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "Adaugă dosar(e) în listă..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "Urmărește legăturile"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr "help.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "Șterge fișierele de pe disc"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2212,19 -2261,19 +2309,19 @@@ msgstr "
"Fișierele se vor pierde. Continui?\n"
"(Acest mesaj poate fi dezactivat în setările extensiei GTKUI)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "Încarcă listă de redare"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "Alte fișiere (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "Salvează lista de redare ca"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "Fișiere de listă DeadBeeF (*.dbpl)"
@@@ -2258,102 -2307,111 +2355,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr "Nu s-a selectat nimic."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr "Înlocuiește cu..."
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr "Adaugă..."
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr "Taie"
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr "Copiază"
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr "Lipește"
+
+#: ../plugins/gtkui/widgets.c:764
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr "Widgetul „%s†nu este disponibil"
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr "Înlocuiește cu..."
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr "Adaugă..."
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr "Taie"
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr "Copiază"
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr "Lipește"
+
+ #: ../plugins/gtkui/widgets.c:942
++>>>>>>> upstream/0.6.2
msgid "Multiple widgets of this type are not supported"
- msgstr ""
+ msgstr "Nu există suport pentru mai multe widgeturi de acest tip"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr "Blochează mișcarea"
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr "Mută fila spre stânga"
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr "Mută fila spre dreapta"
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr "Înlătură fila"
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr "Redenumește fila"
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr "Adaugă o nouă filă"
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr "Arată titlul coloanelor"
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr "Extinde setul cu 1 element"
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr "Micșorează setul cu 1 element"
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr "Omogen"
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr "Extinde"
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr "Umple"
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr "Blochează mișcarea"
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr "Mută fila spre stânga"
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr "Mută fila spre dreapta"
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr "Înlătură fila"
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr "Redenumește fila"
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr "Adaugă o nouă filă"
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr "Arată titlul coloanelor"
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr "Extinde setul cu 1 element"
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr "Micșorează setul cu 1 element"
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr "Omogen"
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr "Extinde"
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr "Umple"
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr "Configurează buton"
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr "Voci:"
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr "Editează lista de redare"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr "Redenumește lista de redare"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr "Înlătură lista de redare"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr "Adaugă o nouă listă de redare"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr "Nume"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr "Navigator liste de redare"
diff --combined po/ru.po
index 388fb50,c08df36..c31f0ff
--- a/po/ru.po
+++ b/po/ru.po
@@@ -3,16 -3,18 +3,24 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
- # waker <wakeroid at gmail.com>, 2013
+ # Alexey Yakovenko <wakeroid at gmail.com>, 2013-2014
+ # Andrei Stepanov, 2014
+ # Andrei Stepanov, 2014
# Dmitriy Simbiriatin <slpiv at mail.ru>, 2010
- # waker <wakeroid at gmail.com>, 2013
+ # Alexey Yakovenko <wakeroid at gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:30+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Russian (http://www.transifex.com/projects/p/deadbeef-player/"
"language/ru/)\n"
"Language: ru\n"
@@@ -22,17 -24,17 +30,17 @@@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "О программе DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Переводчики DeaDBeeF "
@@@ -89,804 -91,836 +97,854 @@@ msgstr "Обнулить предуÑи
msgid "Zero Bands"
msgstr "Обнулить чаÑтоты"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "ПредуÑтановки"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 день %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d дней %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Стоп | %d дорожек | %s общее времÑ"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Моно"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Моно"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Стерео"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d кбит/Ñ "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Пауза | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dГц | %d бит | %s | %d:%02d / %s | %d дорожек | %s общее времÑ"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Ðовый плейлиÑÑ‚"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Ðовый плейлиÑÑ‚ (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "ПлейлиÑÑ‚ Ñ Ð²ÐºÐ»Ð°Ð´ÐºÐ°Ð¼Ð¸"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "ПлейлиÑÑ‚"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "Разделитель (верх и низ)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "Разделитель (лево и право)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Вкладки плейлиÑтов"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "СвойÑтва выделенного"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Отображение обложки альбома"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "Scope"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "Спектральный анализатор"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Кнопка"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr "ПолоÑа перемотки"
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr "Ðлементы ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð³Ñ€Ñ‹Ð²Ð°Ð½Ð¸ÐµÐ¼"
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr "РегулÑтор громкоÑти"
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr "Управление каналами chiptunes"
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Ðе удалоÑÑŒ прочитать файл Ñправки"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Ðе удалоÑÑŒ загрузить файл Ñправки"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
++<<<<<<< HEAD
+"Ð’ данный момент, плеер выполнÑет фоновые задачи. ЕÑли вы завершите его "
+"ÑейчаÑ, задачи будут отменены или прерваны. Ðто может привеÑти к потере "
+"данных."
++=======
+ "Ð’ данный момент, проигрыватель выполнÑет фоновые задачи. ЕÑли вы завершите "
+ "его ÑейчаÑ, задачи могут быть отменены или прерваны. Ðто может привеÑти к "
+ "потере данных."
++>>>>>>> upstream/0.6.2
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "Ð’Ñ‹ вÑе еще хотите выйти?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Предупреждение"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Файл"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Открыть файл(ы)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Добавить файл(ы)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Добавить каталог(и)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Добавить раÑположение"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Ðовый плейлиÑÑ‚"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Загрузить плейлиÑÑ‚"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Сохранить плейлиÑÑ‚"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Выход"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Правка"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_ОчиÑтить"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Выделить вÑÑ‘"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "СнÑÑ‚ÑŒ выделение"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Обратить выделение"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Выделенное"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Удалить"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "ОÑтавить выделенное"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Ðайти"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Сортировать по"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Ðазвание"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Ðомер дорожки"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Ðльбом"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "ИÑполнитель"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Дата"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Случайно"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "ПользовательÑкий"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "ÐаÑтройки"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Вид"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Строка ÑоÑтоÑниÑ"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ðквалайзер"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "Режим дизайна"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "ВоÑпр_оизведение"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "ПорÑдок"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "По очереди"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Перемешивать дорожки"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Перемешивать альбомы"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "ПовторÑÑ‚ÑŒ"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Зациклить вÑе"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Зациклить одиночную пеÑню"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Ðе зацикливать"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Прокручивать плейлиÑÑ‚ автоматичеÑки"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "ВыделÑÑ‚ÑŒ текущую дорожку"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "ОÑтанавливать поÑле текущей"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr "ОÑтанавливать поÑле текущей дорожки"
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr "ОÑтановить поÑле текущего альбома"
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Перейти на текущую дорожку"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Справка"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_ИзменениÑ"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_О программе"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Переводчики"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "ПоиÑк"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Стоп"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "ВоÑпроизвеÑти"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Пауза"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "ПредыдущаÑ"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "СледующаÑ"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Играть вразброÑ"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "О программе"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Выход"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Справка"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "СвойÑтва дорожки"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "РаÑположение:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "ÐаÑтройки"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Применить"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Закрыть"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Метаданные"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "СвойÑтва"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Ðазвание:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Введите название нового Ñтолбца"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Тип:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "ПорÑдковый номер"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "ВоÑпроизводитÑÑ"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Обложка альбома"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "ИÑполнитель - Ðльбом"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "ПродолжительноÑÑ‚ÑŒ"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Ðомер дорожки"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Группа / ИÑполнитель альбома"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Формат:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Выравнивание:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "По левому краю"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "По правому краю"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Отмена"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_ОК"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Модуль вывода:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "УÑтройÑтво вывода:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Ð’Ñегда преобразовывать 8-битный звук в 16-битный"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr "Ð’Ñегда преобразовывать 16-битный звук в 24-битный"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Звук"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Режим Ð°Ð²Ñ‚Ð¾Ð²Ñ‹Ñ€Ð°Ð²Ð½Ð¸Ð²Ð°Ð½Ð¸Ñ Ð³Ñ€Ð¾Ð¼ÐºÐ¾Ñти:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Отключён"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Дорожка"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "ИÑпользовать пиковое значение"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 дБ"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 дБ"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "ПредуÑиление Ð°Ð²Ñ‚Ð¾Ð²Ñ‹Ñ€Ð°Ð²Ð½Ð¸Ð²Ð°Ð½Ð¸Ñ Ð³Ñ€Ð¾Ð¼ÐºÐ¾Ñти:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Общее предуÑиление громкоÑти:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"ДобавлÑÑ‚ÑŒ файлы из командной Ñтроки\n"
"(или файлового менеджера) в Ñтот плейлиÑÑ‚:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "ВоÑÑтанавливать предыдущую ÑеÑÑию при запуÑке"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Ðе добавлÑÑ‚ÑŒ из архивов при добавлении каталогов"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "Ðвто-ÑбраÑывать \"ОÑтановку поÑле текущей пеÑни\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+ "ÐžÐ¿Ñ†Ð¸Ñ \"ОÑтанавливать поÑле текущей дорожки\" будет отключатьÑÑ Ð¿Ð¾Ñле "
+ "ÑрабатываниÑ"
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+ "ÐžÐ¿Ñ†Ð¸Ñ \"ОÑтанавливать поÑле текущего альбома\" будет отключатьÑÑ Ð¿Ð¾Ñле "
+ "ÑрабатываниÑ"
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "ВоÑпроизведение"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "ÐаÑтроить"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "ПредуÑтановка Ð´Ð»Ñ Ñ†ÐµÐ¿Ð¾Ñ‡ÐºÐ¸ DSP"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Загрузить"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Сворачивать в трей при закрытии"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Ðе показывать значок в трее"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+ "Включить авто-определение и перекодирование ÑпонÑкой кодировки SHIFT-JIS"
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "Включить определение и перекодирование руÑÑкой CP1251"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Включить определение и перекодирование китайÑкой CP936"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "ЧаÑтота Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñа (раз за Ñекунду):"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "ТекÑÑ‚ заголовка при проигрывании:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "ТекÑÑ‚ заголовка при оÑтановке:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "ГрафичеÑкий Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ (Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼ перезапуÑк):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr "Проигрыватель"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr "Закрывать плейлиÑÑ‚Ñ‹ Ñредней кнопкой мыши"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr "РиÑовать текущий трек жирным шрифтом"
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Убрать пункт \"Удалить Ñ Ð´Ð¸Ñка\" из контекÑтного меню"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr "Скрыть опцию контекÑтного меню \"Удалить Ñ Ð´Ð¸Ñка\""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "ÐвтоматичеÑки именовать плейлиÑÑ‚Ñ‹ при добавлении одного каталога"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr "ÐвтоматичеÑкий размер колонок под размер окна"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "ИнтерфейÑ/Разное"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Заменить"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Передний план"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Фон"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "ОÑновные цвета"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Средний"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Светлый"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Тёмный"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Базовый"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "ТекÑÑ‚"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Цвета вкладок"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"Заменить (терÑÑŽÑ‚ÑÑ Ð½Ð°Ñтройки темы GTK , но увеличиваетÑÑ ÑкороÑÑ‚ÑŒ "
"визуализации)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr ""
" Ð§Ñ‘Ñ‚Ð½Ð°Ñ \n"
" Ñтрока"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr ""
" ÐÐµÑ‡Ñ‘Ñ‚Ð½Ð°Ñ \n"
" Ñтрока"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr ""
" Ð’Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð°Ñ \n"
" Ñтрока"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr ""
" Выделенный \n"
" текÑÑ‚"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "КурÑор"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Цвета плейлиÑта"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Цвета"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Включить прокÑи-Ñервер"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "ÐдреÑ:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Порт:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Тип прокÑи:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Пароль:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "HTTP User Agent:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "Редактирование аÑÑоциаций Content-Type"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Сеть"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr "Ðазначенные горÑчие клавиши:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr "ДейÑтвие:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<ПуÑто>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr "Сочетание клавиш:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Ð“Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð°Ñ Ð³Ð¾Ñ€ÑÑ‡Ð°Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ°"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -898,122 -932,128 +956,128 @@@ msgstr "
"Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐЕ ÑохранÑÑ‚ÑÑ Ð´Ð¾ тех пор,\n"
"пока вы не нажмете Применить."
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr "_УмолчаниÑ"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "ГорÑчие клавиши"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "ВерÑиÑ:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "ÐвторÑкие права"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "РаÑширениÑ"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "ÐдреÑ:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr "ПриÑвоить ÑобÑтвенное название"
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
- msgstr "Группировать По ..."
+ msgstr "Группировать по ..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "Сортировать по ..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Формат"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "По возраÑтанию"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "По убыванию"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Выберите раÑширение DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "РаÑширение"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "ÐаÑтройки редактора тегов"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ПиÑать ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ПиÑать ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "ПиÑать APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Вырезать ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Вырезать ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Вырезать APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ВерÑÐ¸Ñ ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (РекомендуемаÑ)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "Кодировка ID3v1 (по умолчанию iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ПиÑать ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "ÐÑÑоциации Content-Type"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1025,91 -1065,106 +1089,110 @@@ msgstr "
"\"audio/x-mpeg\", и должны раÑкодироватьÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из плагинов \"stdmpg\" либо "
"\"ffmpeg\"."
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "СброÑить в умолчание"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "Content-Type:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "Плагины:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr "СвойÑтва кнопки"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr "Цвет:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr "Цвет текÑта:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr "Иконка:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr "ÐадпиÑÑŒ:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr "Выбор дейÑтвиÑ"
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+ "Ðтот диалог позволÑет уÑтановить ÑобÑтвенное название Ð´Ð»Ñ Ð»ÑŽÐ±Ð¾Ð³Ð¾ трека. Ðто "
+ "наиболее полезно Ð´Ð»Ñ Ñ€Ð°Ð´Ð¸Ð¾Ñтанций. Ð¢Ð°ÐºÐ°Ñ Ð¶Ðµ Ð¾Ð¿Ñ†Ð¸Ñ Ð¿Ñ€Ð¸ÑутÑтвует в диалоге "
+ "\"Добавить раÑположение\". Переопределенное название поÑвитÑÑ Ð² колонках, "
+ "отображающих поле \"Artist\" (ИÑполнитель), и будет выглÑдеть как "
+ "\"[переопределенное название] иÑполнитель\", еÑли приÑутÑтвует поле Artist, "
+ "либо проÑто \"переопределенное название\", еÑли его нет."
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "ИÑполнитель / Ðльбом"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "â„–"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Добавить в очередь"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr "Добавить в очередь воÑпроизведениÑ"
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Удалить из очереди"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr "Удалить из очереди воÑпроизведениÑ"
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
msgstr "Обновить метаданные"
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Удалить Ñ Ð¶Ñ‘Ñткого диÑка"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr "Удалить Ñ Ð´Ð¸Ñка"
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
- msgstr "Добавить Ñтолбец"
+ msgstr "Добавить колонку"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
- msgstr "Редактировать Ñтолбец"
+ msgstr "Редактировать колонку"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
- msgstr "Удалить Ñтолбец"
+ msgstr "Удалить колонку"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr "ПрикреплÑÑ‚ÑŒ группы во Ð²Ñ€ÐµÐ¼Ñ Ñкроллинга"
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Группировать по"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "ОтÑутÑтвует"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "ИÑполнитель/Дата/Ðльбом"
@@@ -1126,11 -1181,11 +1209,11 @@@ msgstr "ÐаÑтроить %s
msgid "Default Audio Device"
msgstr "Ðудио уÑтройÑтво по умолчанию"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr "Ð’Ñ‹ изменили наÑтройки горÑчих клавиш, но не Ñохранили изменениÑ."
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr "Ð’Ñ‹ уверены, что хотите продолжить без ÑохранениÑ?"
@@@ -1138,7 -1193,7 +1221,7 @@@
msgid "Adding files..."
msgstr "Добавление файлов..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Загрузка..."
@@@ -1151,105 -1206,105 +1234,115 @@@ msgid "Really close the window?
msgstr "Закрыть окно?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[ÐеÑколько значений] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Ключ"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Ключ"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Значение"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[Много значений]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "ЗапиÑÑŒ тегов..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Ðазвание полÑ"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Ðазвание:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Имена полей не должны начинатьÑÑ Ñ \":\" или \"_\""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Ðе удаётÑÑ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ поле"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Поле Ñ Ñ‚Ð°ÐºÐ¸Ð¼ же именем уже ÑущеÑтует, пожалуйÑта, выберите другое имÑ."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Добавить поле"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Удалить поле"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "ИÑпользование: deadbeef [options] [--] [file(s)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Опции:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr ""
" --help или -h ВывеÑти на Ñкран Ñправку (Ñто Ñообщение) и выйти\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Выйти из плеера\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr ""
" --version ВывеÑти на Ñкран информацию о верÑии программы и "
"выйти\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Ðачать воÑпроизведение\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop ОÑтановить воÑпроизведение\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause ПриоÑтановить воÑпроизведение\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause ПриоÑтановить воÑпроизведение\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1257,40 -1312,40 +1350,40 @@@ msgstr "
" --play-pause Ðачать воÑпроизведение еÑли оÑтановлено, в противном "
"Ñлучае - приоÑтановить\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° в плейлиÑте\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° в плейлиÑте\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random ВоÑпроизведение Ñлучайной дорожки в плейлиÑте\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Добавить файл(Ñ‹) в ÑущеÑтвующий плейлиÑÑ‚\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
" --gui PLUGIN выбор плагина интерфейÑа, по-умолчанию \"GTK2\"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
" --nowplaying FMT ВывеÑти на Ñкран форматированное название дорожки\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1303,7 -1358,7 +1396,7 @@@ msgstr "
"комментарий,\n"
" %%r-авторÑкие права, %%e-времÑ, которое прошло \n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1312,28 -1367,24 +1405,43 @@@ msgstr "
" Ðапример: --nowplaying \"%%a - %%t\" должна вывеÑти "
"на Ñкран \"artist - title\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
++<<<<<<< HEAD
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+" Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации, Ñмотрите http://"
+"sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "ПлейлиÑÑ‚"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Да"
+
+#: ../playlist.c:3877
++=======
+ msgid " for more info, see %s\n"
+ msgstr " Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации, Ñм. %s\n"
+
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "ПлейлиÑÑ‚"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Да"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Ðет"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1359,7 -1410,7 +1467,11 @@@ msgstr "
"Группа / ИÑполнитель альбома\n"
"Разное"
++<<<<<<< HEAD
+#: ../plugins/gtkui/deadbeef.glade.h:86
++=======
+ #: ../plugins/gtkui/deadbeef.glade.h:87
++>>>>>>> upstream/0.6.2
msgid ""
"Left\n"
"Right"
@@@ -1367,7 -1418,7 +1479,7 @@@ msgstr "
"Левый\n"
"правый"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1377,7 -1428,7 +1489,7 @@@ msgstr "
"Дорожка\n"
"Ðльбом"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1385,22 -1436,15 +1497,25 @@@ msgstr "
"По возраÑтанию\n"
"По убыванию"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
msgstr ""
"2.3 (РекомендуемаÑ)\n"
"2.4"
++<<<<<<< HEAD
+
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Ðе удалоÑÑŒ найти файл Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ : %s"
++=======
++>>>>>>> upstream/0.6.2
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1413,7 -1457,7 +1528,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr "Добавить аудио CD"
#: ../translation/extra.c:4
@@@ -1707,8 -1751,8 +1822,8 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "ÐаÑтройка ÑобÑтвенных shell-команд"
+ msgid "Configure Custom Shell Commands"
+ msgstr "ÐаÑтройка ÑобÑтвенных шелл-команд"
#. mpgmad
#: ../translation/extra.c:99
@@@ -1724,35 -1768,40 +1839,40 @@@ msgstr "Предпочитать Ñму
msgid "Enable surround"
msgstr "Включить surround"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr "[Ð’Ñтроенный] %s"
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Файл уже ÑущеÑтвует. ПерезапиÑать?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Converter предупреждение"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "ПожалуйÑта, выберите кодировщик"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Converter ошибка"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Конвертирование..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Выберите каталог..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Ðе удалоÑÑŒ Ñохранить предуÑтановку кодировщика"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1760,77 -1809,77 +1880,77 @@@ msgstr "
"Проверьте права доÑтупа на папку, в которой находитÑÑ Ð¿Ñ€ÐµÐ´ÑƒÑтановка, "
"выберите другое Ð¸Ð¼Ñ Ð¸Ð»Ð¸ оÑвободите меÑто на диÑке"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "ПредуÑтановка Ñ Ñ‚Ð°ÐºÐ¸Ð¼ же именем уже ÑущеÑтвует. Выберите другое имÑ."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Ошибка"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Добавить кодировщик"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Редактировать кодировщик"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Удалить предуÑтановку"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Ðто дейÑтвие приведёт к удалению выбранной предуÑтановки. Ð’Ñ‹ уверены? "
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Кодировщики"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Добавить раÑширение в цепочку DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Ðе удалоÑÑŒ Ñохранить предуÑтановку DSP"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "ÐÐ¾Ð²Ð°Ñ Ð¿Ñ€ÐµÐ´ÑƒÑтановка DSP"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Редактировать предуÑтановку DSP "
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "ПредуÑтановки DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Выходной каталог:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "ПиÑать в папку иÑходного трека"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "Сохранить Ñтруктуру каталогов"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Ð˜Ð¼Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ файла:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1840,89 -1889,89 +1960,89 @@@ msgstr "
"РаÑширение (например, .mp3) будет добавлено автоматичеÑки.\n"
"ОÑтавьте Ñто поле пуÑтым Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð°Ñтроек по умолчанию (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Кодировщик:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "ПредуÑтановка DSP:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "КоличеÑтво потоков:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Выходной формат ÑÑмплов:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "ОÑтавить иÑходный формат"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 бит целочиÑленный"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 бит целочиÑленный"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 бит целочиÑленный"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 бит целочиÑленный"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 бит вещеÑтвенный"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "ЕÑли файл ÑущеÑтвует:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "СпроÑить"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Заменить"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Редактировать предуÑтановки"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "БезымÑнный кодировщик"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "РаÑширение выходного файла:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Ðапример mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ Ñтрока"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1932,7 -1981,7 +2052,7 @@@ msgstr "
"Пример: lame - %o\n"
"\"%i\" Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ файла, \"%o\" Ð´Ð»Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ файла, \"-\" Ð´Ð»Ñ stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1942,66 -1991,72 +2062,72 @@@ msgstr "
"<small>\"%o\" - Ð¸Ð¼Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ файла\n"
"\"%i\" - Ð¸Ð¼Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð³Ð¾ входного файла</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Метод:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Конвейер"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Временный файл"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>ЗапиÑÑŒ тегов</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "Редактор предуÑтановок DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "БезымÑÐ½Ð½Ð°Ñ Ð¿Ñ€ÐµÐ´ÑƒÑтановка DSP"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Добавить"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Ðе удалоÑÑŒ найти файл Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ : %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2039,27 -2094,27 +2165,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "СобÑтвенные shell-команды"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "Редактировать"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "Закрыть"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "Редактировать Команду"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "Команда:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2071,17 -2126,17 +2197,17 @@@ msgstr "
"было запущено оÑновное приложение. Может применÑÑ‚ÑŒÑÑ title formatting. "
"Пример: xdg-open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "ID:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "Произвольное название, например \"ÐœÐ¾Ñ shell-команда\""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
@@@ -2090,57 -2145,57 +2216,57 @@@ msgstr "
"ID команды, обычно Ñто короткий идентификатор, например \"youtube_open\". "
"Должен быть уникален."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "Одиночные Треки"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "Работает Ñ Ð¾Ð´Ð½Ð¸Ð¼ выделенным треком."
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "Много треков"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "Работает когда выделено много треков."
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "Локальный"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "Работает Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¼Ð¸ файлами."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "Удаленные"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "Работает Ñ Ñетевыми файлами (например потоки http://)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr "ÐžÐ±Ñ‰Ð°Ñ (Главное меню)"
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "Команда поÑвитÑÑ Ð² главном меню"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2151,72 -2206,72 +2277,76 @@@ msgstr "
"название команды Ñодержит путь меню, как здеÑÑŒ: \"File/ÐœÐ¾Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°\", где "
"File -- название меню из английÑкой верÑии.</small>"
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "Добавить команду"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "Удалить"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr "Ðто дейÑтвие удалит выбранную shell-команду. Ð’Ñ‹ уверены?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "Подтверждение удаление"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "ID должен быть не пуÑтым и уникальным\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "Ðазвание должно быть непуÑтым.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "Shell-команда должна быть непуÑтой.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "ÐедопуÑтимые ЗначениÑ"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "Поддерживаемые звуковые форматы"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "Ð’Ñе файлы (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "Открыть файл(ы)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "Добавить файл(Ñ‹) в плейлиÑÑ‚..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "Добавить папки в плейлиÑÑ‚..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "Следовать по symlink'ам"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr "help.ru.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "Удалить файлы Ñ Ð´Ð¸Ñка"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2224,19 -2279,19 +2354,19 @@@ msgstr "
"Файлы будут потерÑны. Продолжить?\n"
"(Ðтот диалог может быть отключен в наÑтройках плагина GTKUI)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "Загрузить плейлиÑÑ‚"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "Другие файлы (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "Сохранить плейлиÑÑ‚ как"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "Файлы плейлиÑтов DeaDBeeF (*.dbpl)"
@@@ -2270,103 -2325,112 +2400,188 @@@ msgstr "
msgid "Nothing is selected."
msgstr "Ðичего не выбрано."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr "Заменить на..."
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr "Ð’Ñтавить..."
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr "Вырезать"
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr "Скопировать"
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr "Ð’Ñтавить"
+
+#: ../plugins/gtkui/widgets.c:764
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr "Виджет \"%s\" недоÑтупен"
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr "Заменить на..."
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr "Ð’Ñтавить..."
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr "Вырезать"
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr "Скопировать"
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr "Ð’Ñтавить"
+
+ #: ../plugins/gtkui/widgets.c:942
++>>>>>>> upstream/0.6.2
msgid "Multiple widgets of this type are not supported"
msgstr ""
"Одновременное отображение неÑкольких виджетов данного типа не поддерживаетÑÑ."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr "Заблокировать перемещение"
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr "Передвинуть вкладку влево"
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr "Передвинуть вкладку вправо"
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr "Удалить вкладку"
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr "Переименовать вкладку"
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr "Добавить новую вкладку"
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr "Показывать заголовки колонок"
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr "РаÑширить Ñтот Ð±Ð¾ÐºÑ Ð½Ð° 1 Ñлемент"
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr "Сузить Ñтот Ð±Ð¾ÐºÑ Ð½Ð° 1 Ñлемент"
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr "Равномерный"
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr "РаÑширÑÑ‚ÑŒ"
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr "ЗаполнÑÑ‚ÑŒ"
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr "Заблокировать перемещение"
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr "Передвинуть вкладку влево"
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr "Передвинуть вкладку вправо"
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr "Удалить вкладку"
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr "Переименовать вкладку"
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr "Добавить новую вкладку"
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr "Показывать заголовки колонок"
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr "РаÑширить Ñтот Ð±Ð¾ÐºÑ Ð½Ð° 1 Ñлемент"
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr "Сузить Ñтот Ð±Ð¾ÐºÑ Ð½Ð° 1 Ñлемент"
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr "Равномерный"
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr "РаÑширÑÑ‚ÑŒ"
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr "ЗаполнÑÑ‚ÑŒ"
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr "ÐаÑтроить кнопку"
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr "ГолоÑа:"
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr "Редактировать плейлиÑÑ‚"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr "Переименовать плейлиÑÑ‚"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr "Удалить плейлиÑÑ‚"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr "Добавить новый плейлиÑÑ‚"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr "Ðазвание"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr "Браузер плейлиÑтов"
diff --combined po/si_LK.po
index 6cc8540,c54a106..47f5523
--- a/po/si_LK.po
+++ b/po/si_LK.po
@@@ -3,15 -3,15 +3,21 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
- # amscata <amith at compsoc.lk>, 2013
- # amscata <amith at compsoc.lk>, 2013
+ # Amith Chinthaka <amith at compsoc.lk>, 2013
+ # Amith Chinthaka <amith at compsoc.lk>, 2013
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/"
"deadbeef-player/language/si_LK/)\n"
"Language: si_LK\n"
@@@ -20,17 -20,17 +26,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "DeaDBeeF පිළිබඳ විස්à¶à¶» %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s වෙනස්කම් ලොගය"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF පරිවර්à¶à¶šà¶ºà·’න්"
@@@ -87,790 -87,815 +93,827 @@@ msgstr "පූර්ව වර්ධක
msgid "Zero Bands"
msgstr "කලà·à¶´ à·à·”න්â€à¶ºà¶º කරන්න"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "à·ƒà·à¶šà·ƒà·”ම්"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "දිනක් %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "දින %d %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Stopped | %d tracks | %s මුළු ධà·à·€à¶± කà·à¶½à¶º"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "එකම à·à¶¶à·Šà¶¯à¶º දෙපසින්ම ඇසීම"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "එකම à·à¶¶à·Šà¶¯à¶º දෙපසින්ම ඇසීම"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "à·à¶¶à·Šà¶¯ දෙකක් දෙපසින් ඇසීම"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps"
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "මදකට නවà¶à· ඇච|"
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d ගීà¶| %s මුළු ධà·à·€à¶± කà·à¶½à¶º"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "නව ගීචලà·à¶ºà·’ස්à¶à·”à·€"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "නව ගීචලà·à¶ºà·’ස්à¶à·”à·€ (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "ටà·à¶¶ සහිචගීචලà·à¶ºà·’ස්à¶à·”à·€"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "ගීචලà·à¶ºà·’ස්à¶à·”à·€"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "විභේදකය (ඉහළ සහ පහළ)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "විභේදකය (වම සහ දකුණ)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "ගීචලà·à¶ºà·’ස්à¶à·” ටà·à¶¶"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "වරණ à·ƒà¶à·” ගුණà·à¶‚ග"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "ඇල්බම රූප දර්à·à¶±à¶º"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "බලපවà¶à·Šà¶±à· අවකà·à·à¶º"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "වර්ණà·à·€à¶½à·’ය"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "බොà¶à·Šà¶à¶¸"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "උපකà·à¶»à¶š ගොනුව කියවීමට අසමà¶à·Š විය"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "උපකà·à¶»à¶š ගොනුව විවෘචකිරීමට නොහà·à¶šà·’ විය"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- "ධà·à·€à¶šà¶º පසුබිම් කà·à¶»à·Šà¶ºà¶ºà¶šà·Š සිදුකරමින් සිටියි. මේ මොහොà¶à·š එම ධà·à·€à¶šà¶º වස෠දà·à¶¸à·”වහොà¶à·Š හ෠එයට බà·à¶°à· "
- "කළහොà¶à·Š එමඟින් දà¶à·Šà¶ à·„à·à¶±à·’යක් ඇà¶à·’ වීමට ඉඩකඩ ඇà¶."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "ඔබට à¶à·€à¶¸à¶à·Š වස෠දà·à¶¸à·“මට අවà·à·Šâ€à¶ºà¶º ද?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "අනà¶à·”රු ඇඟවීමයි"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "ගොනුව _F"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "ගොනු(ව) විවෘචකරන්න _O"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "ගොනු(à·€) එකà¶à·” කරන්න"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "à·†à·à¶½à·Šà¶©à¶»(ය) එකà¶à·” කරන්න"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "ස්ථà·à¶±à¶ºÂ එකà¶à·” කරන්න"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "නව ගීචලà·à¶ºà·’ස්à¶à·”à·€"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "ගීචලà·à¶ºà·’ස්à¶à·”à·€ විවෘචකරන්න"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "ගීචලà·à¶ºà·’ස්à¶à·”à·€ සුරකින්න"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "ඉවà¶à·Šà·€à¶±à·Šà¶± _Q"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "සංස්කරණය _E"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "පිරිසිදු කරන්න _C"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "සියල්ල à¶à·à¶»à¶±à·Šà¶±"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "සියල්ල à¶à·šà¶»à·“ම ඉවà¶à·ŠÂ කරන්න"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "à¶à·à¶»à·à¶œà¶à·ŠÂ පිළිවෙළ ප්â€à¶»à¶à·’වර්චකරන්න"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "වරණය"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "ඉවà¶à·ŠÂ කරන්න"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "අවà·à·Šâ€à¶º පරිදි කප෠හරින්න"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "සොයන්න _F"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "පිළිවෙළට සකස් කල යුà¶à·Šà¶à·š"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "මà·à¶à·˜à¶šà·à·€"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "ගීà¶à¶ºà·šÂ අංකය"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "ඇල්බමය"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "ගà·à¶ºà¶šà¶ºà·"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "දිනය"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "සසම්භà·à·€à·“"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "රිසි ආකà·à¶»à¶ºà¶§ සකසන්න"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "අභිමà¶à¶º"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "දර්à·à¶±à¶º කරන්න _V"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "à¶à¶à·Šà·€ දර්à·à¶± à¶à·“රුව"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "සමකà·à¶»à¶šà¶º"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "à·ƒà·à·…සුම් කිරීමේ ප්â€à¶»à¶šà·à¶»à¶º"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "නà·à·€à¶ ධà·à·€à¶±à¶º _P"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "අනුපිළිවෙළ"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "රේඛීය"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "ගීà¶Â කලවම් කරන්න"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "ඇල්බම කලවම් කරන්න"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "නà·à·€à¶ නà·à·€à¶ ධà·à·€à¶±à¶º කිරීම"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "සියලු ගීà¶Â නà·à·€à¶ නà·à·€à¶Â ධà·à·€à¶±à¶ºÂ කරන්න"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "ගීය නà·à·€à¶Â නà·à·€à¶ ධà·à·€à¶±à¶º කරන්න"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "නà·à·€à¶Â නà·à·€à¶ ධà·à·€à¶±à¶ºÂ නොකරන්න"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "අනුචලන පිලිවෙළින් ධà·à·€à¶±à¶ºÂ පෙන්වන්න"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "කර්සරය මගින් ධà·à·€à¶±Â පිළිවෙළ පෙන්වන්න"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "මෙම ගීà¶à¶ºà¶§Â පසු නවà¶à·Šà·€à¶±à·Šà¶±"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "ධà·à·€à¶±à¶º කල ගීà¶à¶ºà¶§ යොමුකරන්න"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "උදව් _H"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "වෙනස්කම් ලොගය _C"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "පිළිබඳ à¶à·œà¶»à¶à·”රු _A"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "පරිවර්à¶à¶š _T"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "සොයන්න"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "නවà¶à¶±à·Šà¶±"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "ධà·à·€à¶±à¶ºÂ කරන්න"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "මදකට නà¶à¶» කරන්න"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "පෙර ගීà¶à¶º"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "මීළඟ ගීà¶à¶º"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "අහඹු ලෙස ධà·à·€à¶±à¶ºÂ කරන්න"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "පිළිබඳ à¶à·œà¶»à¶à·”රු"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "නවà¶à¶±à·Šà¶±"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "උදව්"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "ගීà¶à¶ºà·š à¶à·œà¶»à¶à·”රු"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "ස්ථà·à¶±à¶º:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "à·ƒà·à¶šà·ƒà·”ම්"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "යොදන්න _A"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "නිම෠කරන්න _C"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "පà·à¶»-දà¶à·Šà¶"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "à·€à¶à·Šà¶šà¶¸à·Š"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "à·à·“ර්ෂය:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "නව සිරස් à¶à·“රු à·à·“ර්ෂය මෙහි ඇà¶à·”à·…à¶à·ŠÂ කරන්න"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "වර්ගය:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "අයිà¶à¶¸ අංකය"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "à·€à·à¶¯à¶±à¶ºÂ වෙමින් පවà¶à·“"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "ඇල්බම රූපය"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "ගà·à¶ºà¶šà¶ºà·Â - ඇල්බමය"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "පවà¶à·Šà¶±à·Â කà·à¶½à¶º"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "ගීà¶Â අංකය"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "සංගීà¶Â කණ්ඩà·à¶ºà¶¸ / à·à·’ල්පියà·"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "ආකෘà¶à·’ය:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "පෙළගà·à·ƒà·Šà¶¸:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "වම"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "දකුණ"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "අවලංගු කරන්න _C"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "හරි _O"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "ප්â€à¶»à¶à·’දà·à¶± පේනු මෘදුකà·à¶‚ගය"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "ප්â€à¶»à¶à·’දà·à¶± උපකරණය"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "සෑමවිට ම බිට් 8 à·à·Šâ€à¶»à·€à·Šâ€à¶º ගොනු බිට් 16 ට පරිවර්à¶à¶±à¶ºÂ කරන්න"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr "සෑමවිට ම බිට් 16 à·à·Šâ€à¶»à·€à·Šâ€à¶º ගොනු බිට් 24 ට පරිවර්à¶à¶±à¶ºÂ කරන්න"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "à·à¶¶à·Šà¶¯à¶º"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "à·à¶¶à·Šà¶¯ පරිපà·à¶½à¶± ආකà·à¶»à¶º"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "අක්â€à¶»à·“ය කරන්න"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "ගීà¶à¶º"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "à·à¶¶à·Šà¶¯ පරිපà·à¶½à¶±à¶º ඉහළ පරà·à·ƒ වලින්"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "à·à¶¶à·Šà¶¯ පරිපà·à¶½à¶± පූර්ව වර්ධකය"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "සමස්චපූර්ව වර්ධකය"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr "විධà·à¶±Â à¶à·“රුව (à·„à·Â ගොනු කළමනà·à¶šà¶»à¶«à¶º) මගින්, ගීà¶Â ලà·à·ƒà·Šà¶à·”වට ගොනු ඇà¶à·”ලà¶à·ŠÂ කිරීම"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "පටන්ගන්මෙදී, පෙර සà·à·ƒà·’ය නà·à·€à¶ අරඹන්න"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "à·†à·à¶½à·Šà¶©à¶»Â එකà¶à·” කිරීමේදී, සංරක්ෂණà·à¶œà·à¶»à¶ºà·™à¶±à·ŠÂ එකà¶à·” නොකරන්න"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "\"මෙම ගීà¶à¶ºà¶§ පසු නà·à·€à¶à·“ම\", ස්වයංක්â€à¶»à·“යව නà·à·€à¶ සකසන්න"
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "නà·à·€à¶Â ධà·à·€à¶±à¶ºÂ කරන්න"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "à·„à·à¶©à¶œà·à·ƒà·Šà·€à·“ම"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP දà·à¶¸Â පිහිටුවීම"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "ප්â€à¶»à·€à·šà·à¶±à¶º _L"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "වස෠à¶à·à¶§à·’ය à¶à·”ලට හකුලුවන්න"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "පද්ධà¶à·’ à¶à·à¶§à·’ අයිකනය සඟවන්න"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "රුසියà·à¶±à·” CP1251 අනà·à·€à¶»à¶«à¶º කිරීම සහ ප්â€à¶»à¶à·’කේà¶à¶±à¶º කිරීම සක්â€à¶»à·“ය කරන්න"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "චීන CP936 අනà·à·€à¶»à¶«à¶º කිරීම සහ ප්â€à¶»à¶à·’කේà¶à¶±à¶º කිරීම සක්â€à¶»à·“ය කරන්න"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "අà¶à·”රු මුහුණචනà·à·€à·”ම් වීමේ අනුපà·à¶à¶º (à¶à¶à·Šà¶´à¶»à¶ºà¶šà¶§ à·€à·à¶»)"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "ධà·à·€à¶±à¶º අà¶à¶»à¶à·”ර මà·à¶à·˜à¶šà· à¶à·“රයේ ඇà¶à·’ à·€à·à¶šà·’ය"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "ධà·à·€à¶±à¶º නà·à·€à¶à·– විට මà·à¶à·˜à¶šà· à¶à·“රයේ ඇà¶à·’ à·€à·à¶šà·’ය"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "අà¶à·”රු මුහුණà¶à·Š කෙවෙනිය (වෙනස් වීමට නà·à·€à¶ පණ ගà·à¶±à·Šà·€à·’ය යුà¶à·”යි)"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "මෙà¶à·à¶±à·’න් මකà·à¶¯à¶¸à¶±à·Šà¶± යන සන්දර්භ මෙනූ අයිà¶à¶¸à¶º සඟවන්න"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "à¶à¶±à·’ à·†à·à¶½à·Šà¶©à¶»à¶ºà¶šà·Š à¶à·”ළට එක් කිරීමේදී ගීචලà·à¶ºà·’ස්à¶à·” වල නම් ස්වයංක්â€à¶»à·“යව සකසන්න"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "GUI/Misc"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "අà¶à·’ක්â€à¶»à¶¸à¶±à¶º කරන්න"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "පෙරබිම"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "පසුබිම"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "සෙවුම් à¶à·“රු/à·à¶¶à·Šà¶¯Â à¶à·“රු වර්ණ"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "මධ්â€à¶ºà¶¸ පà·à·„à·"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "ලà·Â පà·à·„à·"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "අඳුරු පà·à·„à·"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "පà·à¶¯à¶¸"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "පà·à¶¨à¶º"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "පටි à¶à·“රු පà·à·„à·à¶ºà¶±à·Š"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "ප්â€à¶»à¶à·’ක්ෂේප කරන්න (GTK රුක් දසුන් à¶à·šà¶¸à·à·€ නà·à¶à·’වන නමුà¶à·Š එය ගීà¶à¶º පරිවර්ථනය පහසු කරවයි)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "ඉරට්ටේ පේළි"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "ඔà¶à·Šà¶à·š පේළි"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "à¶à·à¶»à·à¶œà¶à·Š පේළිය"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "à¶à·à¶»à·à¶œà¶à·ŠÂ අකුරු"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "කර්සරය"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "ගීචලà·à¶ºà·’ස්à¶à·” පà·à·„à·à¶ºà¶±à·Š"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "පà·à·„à·à¶ºà¶±à·Š"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "නියුà¶à·” සේවà·à¶¯à·à¶ºà¶šà¶º සක්â€à¶»à·’ය කරන්න"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "නියුà¶à·” සේවà·à¶¯à·à¶ºà¶šÂ ලිපිනය:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "නියුà¶à·” සේවà·à¶¯à·à¶ºà¶š à¶à·œà¶§:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "නියුà¶à·” සේවà·à¶¯à·à¶ºà¶š වර්ගය:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "නියුà¶à·” සේවà·à¶¯à·à¶ºà¶š භà·à·€à·’චනà·à¶¸à¶º:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "නියුà¶à·” සේවà·à¶¯à·à¶ºà¶š මුරපදය:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "HTTP භà·à·€à·’චඒජන්à¶à·€à¶»à¶ºà·"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "අන්à¶à¶»à·Šà¶œà¶-වර්ග අà¶à¶» සබà·à¶³à·“ම සංස්කරණය කරන්න"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "ජà·à¶½à¶º"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr "කෙටි යà¶à·”රු සංයà·à¶¢à¶± ආදේ෠කරන්න:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr "ක්â€à¶»à·’යà·à·€à¶±à·Š:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<Not set>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr "යà¶à·”රු සංයà·à¶¢à¶±:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "ගà·à¶½à·“ය කෙටි යà¶à·”රු සංයà·à¶¢à¶±"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -878,122 -903,128 +921,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "කෙටි යà¶à·”රු සංයà·à¶¢à¶±"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "සංස්කරණය"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "පිටපà¶à·Š කිරීමේ අයිà¶à·’ය"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "කෙවෙනි මෘදුකà·à¶‚ගය"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "සමුහ කල යුà¶à·Šà¶à·š ..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "අනුපිළිවෙළට සකස් කල යුà¶à·Šà¶à·š ..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "ආකෘà¶à·’ය"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "ආරà·à·„න"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "අවරà·à·„න"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "DSP කෙවෙනි මෘදුකà·à¶‚ගය à¶à·à¶»à¶±à·Šà¶±"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "කෙවෙනි මෘදුකà·à¶‚ගය"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "ටà·à¶œà·Š ලියන සà·à¶šà·ƒà·”ම්"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ID3v2 ලියන්න"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ID3v1 ලියන්න"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "APEv2 ලියන්න"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "ID3v2 ඉවà¶à·Šà¶šà¶»à¶±à·Šà¶±"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "ID3v1 ඉවà¶à·Šà¶šà¶»à¶±à·Šà¶±"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "APEv2 ඉවà¶à·Šà¶šà¶»à¶±à·Šà¶±"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 සංස්කරණය"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (නිර්දේà·à·’à¶)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3vI සංකේà¶Â ආකේà¶à¶±à¶º (à·ƒà·à¶¸à·à¶±à·Šâ€à¶º භà·à·€à·’à¶à¶º iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ID3v2.4 ලියන්න"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "අන්à¶à¶»à·Šà¶œà¶-වර්ග අà¶à¶» සබà·à¶³à·“ම"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1005,91 -1036,100 +1054,104 @@@ msgstr "
"වර්ගය පà·à·€à¶à·’ය à·„à·à¶šà·’ අà¶à¶» එය DeaDBeeF à·„à·’ \"stdmpg\" à·„à· \"ffmpeg\" කෙවෙනි මෘදුකà·à¶‚ග "
"භà·à·€à·’à¶à¶ºà·™à¶±à·Š විකේà¶à¶±à¶º කල යුà¶à·”à·€ පà·à·€à¶à·’ය à·„à·à¶šà·’ය."
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "à·ƒà·à¶¸à·à¶±à·Šâ€à¶ºà¶º භà·à·€à·’චවලට නà·à·€à¶ සකසන්න"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "අන්à¶à¶»à·Šà¶œà¶-වර්ග:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "කෙවෙනි මෘදුකà·à¶‚ග"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr "බොà¶à·Šà¶à¶¸à·Š à·ƒà¶à·” ගුණà·à¶‚ග"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr "වර්ණ:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr "අකුරු වල පà·à·„à·à¶º:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr "අයිකන:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr "ලේබල:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr "ක්â€à¶»à·’යà·à·€ වරණය කරන්න"
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "ගà·à¶ºà¶šà¶ºà·Â / ඇල්බම"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "ගීà¶Â අංකය"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "නà·à·€à¶ ධà·à·€à¶±Â පෙලගà·à·ƒà·Šà¶¸à¶§Â එකà¶à·”කරන්න"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "නà·à·€à¶ ධà·à·€à¶±Â පෙලගà·à·ƒà·Šà¶¸à·™à¶±à·ŠÂ ඉවà¶à·ŠÂ කරන්න"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "පà·à¶»-දà¶à·Šà¶ නà·à·€à¶ ගන්න"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "à¶à·à¶§à·’යෙන් ඉවà¶à·ŠÂ කරන්න"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "නව සිරස් à¶à·“රුවක් එකà¶à·” කරන්න"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "සිරස් à¶à·“රුව සංස්කරණය කරන්න"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "සිරස් à¶à·“රුව ඉවà¶à·ŠÂ කරන්න"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "පà·à¶¯à¶šÂ කරගෙන කණ්ඩà·à¶ºà¶¸à·ŠÂ කිරීම"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "කිසිවක් නà·à¶"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "ගයකයà·/දිනය/ඇල්බමය"
@@@ -1106,11 -1146,11 +1168,11 @@@ msgstr "වින්â€à¶ºà·à·ƒ කි
msgid "Default Audio Device"
msgstr "à·ƒà·à¶¸à·à¶±à·Šâ€à¶ºà¶ºà·™à¶±à·Š භà·à·€à·’à¶à· කරන à·à·Šâ€à¶»à·€à·Šâ€à¶º උපà·à¶‚ගය"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1118,7 -1158,7 +1180,7 @@@
msgid "Adding files..."
msgstr "ගොනු එකà¶à·” කිරීම..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "ඇරඹීම..."
@@@ -1131,128 -1171,128 +1193,138 @@@ msgid "Really close the window?
msgstr "කවුළුව නිමà·à¶šà·’රීමට අවà·à·Šâ€à¶ºà¶¯?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[බහු අගයන්]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "යà¶à·”ර"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "යà¶à·”ර"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "වටිනà·à¶šà¶¸"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[බහු අගයන්]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "ටà·à¶œà·Š ලිවීම..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "ක්ෂේà¶à·Šâ€à¶» නà·à¶¸à¶º"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "නම:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "ක්ෂේà¶à·Šâ€à¶» නà·à¶¸ : ලකුණකින් à·„à· _ ලකුණකින් ආරම්භ නොකල යුà¶à·”ය"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "ක්ෂේà¶à·Šâ€à¶»à¶º එකà¶à·” කල නොහà·à¶š"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "මෙනමින් දà·à¶±à¶§à¶¸à¶à·Š ක්ෂේà¶à·Šâ€à¶»à¶ºà¶šà·Š පවà¶à·“, කරුණà·à¶šà¶» වෙනà¶à·Š නමක් භà·à·€à·’à¶à· කරන්න."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "ක්ෂේà¶à·Šâ€à¶»à¶º එකà¶à·” කරන්න"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "ක්ෂේà¶à·Šâ€à¶»à¶º ඉවà¶à·Š කරන්න"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "භà·à·€à·’à¶à¶º: deadbeef [විකල්ප] [--] [ගොනු(à·€)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "විකල්ප:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr "--help à·„à· -h ආධà·à¶»à¶š විස්à¶à¶» (මෙම පණිවිඩය) දර්à·à¶±à¶º කර ඉවà¶à·Š වන්න\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr "--quit ධà·à·€à¶šà¶ºà·™à¶±à·Š ඉවà¶à·Šà·€à¶±à·Šà¶±\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr "--version සංස්කරණ à¶à·œà¶»à¶à·”රු දර්à·à¶±à¶º කර ඉවà¶à·Š වන්න\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr "--play ගීචධà·à·€à¶±à¶º අරඹන්න\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr "--stop ගීචධà·à·€à¶±à¶º නවà¶à·Šà·€à¶±à·Šà¶±\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr "--pause ගීචධà·à·€à¶±à¶º මදකට නà¶à¶» කරන්න\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr "--toggle-pause ධà·à·€à¶±à¶º මදකට නà¶à¶» කිරීම හ෠නà·à·€à¶ ධà·à·€à¶±à¶º කිරීම\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr "--play-pause ගීචධà·à·€à¶±à¶º නවà¶à· ඇà¶à·Šà¶±à¶¸à·Š ධà·à·€à¶±à¶º අරභන්න, නà·à¶à·’නම් ධà·à·€à¶±à¶º මදකට නවà¶à·Šà·€à¶±à·Šà¶±\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr "--next ගීචලà·à¶ºà·’ස්à¶à·”වේ ඇà¶à·’ ඊළඟ ගීà¶à¶º ධà·à·€à¶±à¶º කරන්න\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr "--prev ගීචලà·à¶ºà·’ස්à¶à·”වේ කළින් ඇà¶à·’ ගීà¶à¶º ධà·à·€à¶±à¶º කරන්න\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr "--random ගීචලà·à¶ºà·’ස්à¶à·”වේ ඇà¶à·’ ගීචසසම්භà·à·€à·“ ලෙස ධà·à·€à¶±à¶º කරන්න\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr "--queue පවà¶à·’න ගීà¶(ය) ලà·à¶ºà·’ස්à¶à·”වට නව ගොනු එකà¶à·” කරන්න\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
@@@ -1260,12 -1300,12 +1332,12 @@@ msgstr "
"--gui PLUGIN භà·à·€à·’à¶à· කිරීමට අවà·à·Šâ€à¶ºà¶º අà¶à·”රු මුහුණචසඳහන් කරන්න, à·ƒà·à¶¸à·à¶±à·Šâ€à¶ºà¶ºà·™à¶±à·Š භà·à·€à·’à¶à· කරන්නේ \\"
"\"GTK2\\\"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr "--nowplaying FMT සම්මචප්â€à¶»à¶à·’දà·à¶±à¶ºà¶§ ගීà¶à¶ºà·š ආකෘà¶à·“කරණය කරන ලද නම දර්à·à¶±à¶º කරන්න\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1278,7 -1318,7 +1350,7 @@@ msgstr "
"\n"
"පිටපà¶à·Š කිරීමේ අයිà¶à·’ය[r], ධà·à·€à¶±à¶º කිරීමට ඉà¶à·’රිව ඇà¶à·’[e]\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1286,28 -1326,24 +1358,36 @@@
msgstr ""
"උදà·: --nowplaying \"%%a - %%t\" විධà·à¶±à¶º \"ගà·à¶ºà¶šà¶ºà· හ෠ගීà¶à¶ºà·š නම\" දර්à·à¶±à¶º කල යුà¶à·”ය\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- "à·€à·à¶©à·’ විස්à¶à¶» සඳහà·, http://sourceforge.net/apps/mediawiki/deadbeef/index.php?"
- "title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "à·ƒà·à¶¸à·à¶±à·Šâ€à¶º භà·à·€à·’à¶à¶º"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "ඔව්"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "à·ƒà·à¶¸à·à¶±à·Šâ€à¶º භà·à·€à·’à¶à¶º"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "ඔව්"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "නà·à·„à·"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1343,7 -1379,7 +1423,7 @@@ msgstr "
"\n"
"රිසි ආකà·à¶»à¶º"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1352,7 -1388,7 +1432,7 @@@ msgstr "
"\n"
"දකුණ"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1364,7 -1400,7 +1444,7 @@@ msgstr "
"\n"
"ඇල්බමය"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1373,7 -1409,7 +1453,7 @@@ msgstr "
"\n"
"අවරà·à·„ණ"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1382,14 -1418,7 +1462,7 @@@ msgstr "
"\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "%s pixmap ගොනුව සොයà·à¶œà¶ නොහà·à¶šà·’ය"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1401,8 -1430,8 +1474,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "ගීචඅඩංගු සංයුක්චà¶à·à¶§à·’ය ඇà¶à·”à·…à¶à·Š කරන්න"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1694,8 -1723,8 +1767,8 @@@ msgstr "ස්වයංක්â€à¶»à·“à
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "රිසි ආකà·à¶»à¶ºà¶§ shell විධà·à¶± සකස් කරන්න"
+ msgid "Configure Custom Shell Commands"
+ msgstr ""
#. mpgmad
#: ../translation/extra.c:99
@@@ -1711,35 -1740,40 +1784,40 @@@ msgstr "à·à¶¶à·Šà¶¯à¶º වටෙන්
msgid "Enable surround"
msgstr "à·à¶¶à·Šà¶¯à¶º වටෙන්ම ඇසීම සක්â€à¶»à·“ය කරන්න"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "ගොනුව දà·à¶±à¶§à¶¸à¶à·Š පවà¶à·“. එය මà¶à¶¸ ලියන්නද?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "පරිවර්ථක අවවà·à¶¯à¶ºà¶šà·Š"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "කරුණà·à¶šà¶» ආකේà¶à¶šà¶º à¶à·à¶»à¶±à·Šà¶±"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "පරිවර්ථක දà·à·‚යක්"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "පරිවර්ථනය කරමින් පවà¶à·“..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "à·†à·à¶½à·Šà¶©à¶»à¶º සුරකින්න..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "ආකේà¶à¶š පෙර à·ƒà·à¶šà·ƒà·”ම සුරà·à¶šà·“මට නොහà·à¶šà·’ විය"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1747,77 -1781,77 +1825,77 @@@ msgstr "
"පෙර à·ƒà·à¶šà·ƒà·”ම් à·†à·à¶½à·Šà¶©à¶»à¶ºà·š අවසරයන් පරීක්ෂ෠කරන්න, වෙනà¶à·Š නà·à¶¸à¶ºà¶šà·Š ලබ෠ගà·à¶±à·“මට උà¶à·Šà·ƒà·à·„ කරන්න, හ෠දෘඩ "
"à¶à·à¶§à·’යේ යම් ඉඩ ප්â€à¶»à¶¸à·à¶«à¶ºà¶šà·Š නිදහස් කරන්න"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "මෙම නමින් à¶à·€à¶à·Š පෙර à·ƒà·à¶šà·ƒà·”මක් දà·à¶±à¶§à¶¸à¶à·Š පවà¶à·“. වෙනà¶à·Š නà·à¶¸à¶ºà¶šà·Š ලබ෠දෙන්න."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "දà·à·‚යක්"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "නව ආකේà¶à¶šà¶º එකà¶à·” කරන්න"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "ආකේà¶à¶šà¶º සංස්කරණය කරන්න"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "පෙර à·ƒà·à¶šà·ƒà·”ම ඉවà¶à·Š කරන්න"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "මෙම ක්â€à¶»à·’යà·à·€ මඟින් à¶à·à¶»à¶± ලද පෙර à·ƒà·à¶šà·ƒà·”ම මකà·à¶¯à·à¶¸à·“මට නියමිà¶à¶ºà·’. එය සිදුකරන්නද?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "ආකේà¶à¶š"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "DSP දà·à¶¸à¶ºà¶§ කෙවෙනි මෘදුකà·à¶‚ගය ඇà¶à·”à·…à¶à·Š කරන්න"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "DSP පෙර à·ƒà·à¶šà·ƒà·”ම සුරà·à¶šà·“මට නොහà·à¶šà·’ විය"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "නව DSP පෙර à·ƒà·à¶šà·ƒà·”ම"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "DSP පෙර à·ƒà·à¶šà·ƒà·”ම සංස්කරණය කරන්න"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP පෙර à·ƒà·à¶šà·ƒà·”ම්"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "ප්â€à¶»à¶à·’දà·à¶± à·†à·à¶½à·Šà¶©à¶»à¶º:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "ගීචඅඩංගු à·†à·à¶½à·Šà¶©à¶»à¶ºà¶§ ලියන්න"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "සංරක්ෂිචෆà·à¶½à·Šà¶©à¶» ආකෘà¶à·’ය"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "ප්â€à¶»à¶à·’දà·à¶± ගොනු නà·à¶¸à¶º:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1828,89 -1862,89 +1906,89 @@@ msgstr "
"\n"
"à·ƒà·à¶¸à·à¶±à·Šâ€à¶ºà¶ºà·™à¶±à·Š භà·à·€à·’à¶à· කරන දිගු සඳහ෠ක්ෂේà¶à·Šâ€à¶»à¶º හිස්ව à¶à¶¶à¶±à·Šà¶± (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "ආකේà¶à¶šà¶º:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP පෙර à·ƒà·à¶šà·ƒà·”ම"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "සමà·à¶±à·Šà¶à¶»à·€ ක්â€à¶»à·’යà·à¶à·Šà¶¸à¶š වන à·€à·à¶©à·ƒà¶§à·„න් ගණන:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "ප්â€à¶»à¶à·’දà·à¶± ආකෘà¶à·’ ආදර්à·à¶º:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "ප්â€à¶»à¶·à·€ ආකෘà¶à·’ය පවà¶à·Šà·€à· ගන්න"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "බිට් 8 ඇà¶à·’ ලකුණු සහිචනිඛිල"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "බිට් 16 ඇà¶à·’ ලකුණු සහිචනිඛිල"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "බිට් 24 ඇà¶à·’ ලකුණු සහිචනිඛිල"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "බිට් 32 ඇà¶à·’ ලකුණු සහිචනිඛිල"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "බිට් 32 ඇà¶à·’ දà·à¶¸"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "ගොනුව පවà¶à·’න විට:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Prompt"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "එය මචලියන්න"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "ආකේà¶à¶š පෙර à·ƒà·à¶šà·ƒà·”ම් සංස්කරණය කරන්න"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "නම් නොකල ආකේà¶à¶šà¶º"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "ප්â€à¶»à¶à·’දà·à¶± ගොනු දිගුව:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "උදà·. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "විධà·à¶± අà¶à·”රු මුහුණà¶"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1921,7 -1955,7 +1999,7 @@@ msgstr "
"\n"
"ආදà·à¶± ගොනු සඳහ෠%i, ප්â€à¶»à¶à·’දà·à¶± ගොනු සඳහ෠%o, -සම්මචආදà·à¶±à¶º සඳහà·"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1932,66 -1966,72 +2010,72 @@@ msgstr "
"\n"
"%i - à¶à·à·€à¶šà·à¶½à·’ක ආදà·à¶± ගොනු නà·à¶¸à¶º</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "ක්â€à¶»à¶¸:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Pipe"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "à¶à·à·€à¶šà·à¶½à·’ක ගොනු"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>ටà·à¶œà·Š ලියනය</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "DSP පෙර à·ƒà·à¶šà·ƒà·”ම් සංස්කà·à¶»à¶šà¶º"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "නම් නොකල DSP පෙර à·ƒà·à¶šà·ƒà·”ම"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "එකà¶à·” කරන්න"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "%s pixmap ගොනුව සොයà·à¶œà¶ නොහà·à¶šà·’ය"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2036,27 -2076,27 +2120,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "ව්â€à¶ºà·€à·„à·à¶»à·’ක shell විධà·à¶±"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "සංස්කරණය කරන්න"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "නිම෠කරන්න"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "විධà·à¶±à¶º සංස්කරණය කරන්න"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "විධà·à¶±à¶º:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2067,17 -2107,17 +2151,17 @@@ msgstr "
"අà¶à·Šà¶à¶±à·à¶¸à¶à·’ක shell විධà·à¶±à¶ºà¶šà·’. එය ප්â€à¶»à¶°à·à¶± à·€à·à¶©à·ƒà¶§à·„න ක්â€à¶»à·’යà·à¶à·Šà¶¸à¶š වීම ආරම්භ වූ shell සංදර්හය à¶à·”ළම "
"ක්â€à¶»à·’යà·à¶à·Šà¶¸à¶š වීමට නියමිà¶à¶ºà·’. à·à·“ර්ෂ ආකෘà¶à·“කරණය භà·à·€à·’à¶à· කල à·„à·à¶šà·’ය. උදà·à·„රණ ලෙස: xdg-open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "අනන්â€à¶ºà¶à·à·€à¶º"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "නිදහස් ආරකින් ඇà¶à·’ නමකි, උදà·. \\\"My Shell Command\\\""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
@@@ -2086,57 -2126,57 +2170,57 @@@ msgstr "
"විධà·à¶± à·„à·à¶³à·’නුම, à·ƒà·à¶¸à·à¶±à·Šâ€à¶ºà¶ºà·™à¶±à·Š එය කෙටි විය යුà¶à·”ය, උදà·à·„රණ ලෙස \"youtube_open\". සහ එය "
"අද්විà¶à·“ය විය යුà¶à·”යි."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "à¶à¶±à·’ ගීà¶"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "à¶à¶±à·’ ගීà¶à¶ºà¶šà·Š මචවà·à¶© කරන්න"
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "බහු ගීà¶"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "බහු ගීචමචවà·à¶© කරන්න"
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "පරිස්ථà·à¶±à·“ය"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "පරිස්ථà·à¶±à·“ය ගොනු මචක්â€à¶»à·’යà·à¶à·Šà¶¸à¶š වේ."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "දුරස්ථ"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "දුරස්ථ ගොනු මචක්â€à¶»à·’යà·à¶à·Šà¶¸à¶š වේ (උදà·. http:// streams)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "අයිà¶à¶¸à¶º ප්â€à¶»à¶°à·à¶± මෙනුව à¶à·”à·… පෙනී සිටිය යුà¶à·”යි"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2144,72 -2184,72 +2228,76 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "විධà·à¶±à¶º ඇà¶à·”ලà¶à·Š කරන්න"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "මක෠දමන්න"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr "මෙම ක්â€à¶»à·’යà·à·€ මඟින් à¶à·à¶»à¶± ලද shell විධà·à¶±à¶º මකà·à¶¯à·à¶¸à·“මට නියමිà¶à¶ºà·’. එය සිදුකරන්නද?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "ඉවà¶à·Š කිරීම à¶à·„වුරු කරන්න"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "අනන්â€à¶ºà¶à· ක්ෂේà¶à·Šâ€à¶»à¶º හිස්ව නොà¶à·à¶¶à·’ය යුà¶à·” අà¶à¶» අද්විà¶à·“ය විය යුà¶à·”ය.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "මà·à¶à·˜à¶šà·à·€ හිස්ව නොà¶à·à¶¶à·’ය යුà¶à·”ය.\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "Shell විධà·à¶±à¶º හිස්ව නොවිය යුà¶à·”ය.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "වලංගු නොවන අගයන්"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "සහà·à¶ºà¶š හඬ ආකෘà¶à·’"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "සියලුම ගොනු (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "ගොනු(ව) විවෘචකරන්න..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "ධà·à·€à¶± ලà·à¶ºà·’ස්à¶à·”වට ගොනු(à·€) එකà¶à·” කරන්න..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "ධà·à·€à¶± ලà·à¶ºà·’ස්à¶à·”වට à·†à·à¶½à·Šà¶©à¶»(ය) එකà¶à·” කරන්න..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "Symlinks අනුගමනය කරන්න"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr "help.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "à¶à·à¶§à·’යේ à¶à·’බෙන ගොනු ඉවà¶à·ŠÂ කරන්න"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2218,19 -2258,19 +2306,19 @@@ msgstr "
"\n"
"(මෙම කà¶à·’කà·à·€à¶ GTKUI මà·à¶»à·Šà¶œ අපගචකල හà·à¶š)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "ගීචලà·à¶ºà·’ස්à¶à·”à·€ විවෘචකරන්න"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "අනෙකුà¶à·ŠÂ ගොනු (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "ගීචලà·à¶ºà·’ස්à¶à·”à·€ මෙනමින් සුරකින්න"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "DeaDBeeF ගීචලà·à¶ºà·’ස්à¶à·” ගොනු (*.dbpl)"
@@@ -2268,102 -2308,111 +2356,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr "කිසිවක් වරණය කර නොමà·à¶."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr "මෙයින් ප්â€à¶»à¶à·’ස්ථà·à¶´à¶±à¶º කරන්න..."
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr "අඩංගු කරන්න..."
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr "කපන්න"
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr "පිටපà¶à·Š කරන්න"
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr "අලවන්න"
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr "චලන නවà¶à¶±à·Šà¶±"
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr "ටà·à¶¶à¶º වම් දෙසට චලනය කරවන්න"
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr "ටà·à¶¶à¶º දකුණු දෙසට චලනය කරවන්න"
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr "ටà·à¶¶à¶º ඉවà¶à·Š කරන්න"
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr "ටà·à¶¶à¶ºà·š නම වෙනස් කරන්න"
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr "නව ටà·à¶¶à¶ºà¶šà·Š එකà¶à·” කරන්න"
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr "à¶à·“රු à·à·“ර්ෂයන් දර්à·à¶±à¶º කරන්න"
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr "පෙට්ටිය එක් අයිà¶à¶¸à¶ºà¶šà·’න් විහිදුවන්න"
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr "පෙට්ටිය එක් අයිà¶à¶¸à¶ºà¶šà·’න් හකුළුවන්න"
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr "සජà·à¶à·“ය"
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr "විහිදුවන්න"
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr "පුරවන්න"
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr "මෙයින් ප්â€à¶»à¶à·’ස්ථà·à¶´à¶±à¶º කරන්න..."
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr "අඩංගු කරන්න..."
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr "කපන්න"
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr "පිටපà¶à·Š කරන්න"
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr "අලවන්න"
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr "චලන නවà¶à¶±à·Šà¶±"
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr "ටà·à¶¶à¶º වම් දෙසට චලනය කරවන්න"
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr "ටà·à¶¶à¶º දකුණු දෙසට චලනය කරවන්න"
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr "ටà·à¶¶à¶º ඉවà¶à·Š කරන්න"
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr "ටà·à¶¶à¶ºà·š නම වෙනස් කරන්න"
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr "නව ටà·à¶¶à¶ºà¶šà·Š එකà¶à·” කරන්න"
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr "à¶à·“රු à·à·“ර්ෂයන් දර්à·à¶±à¶º කරන්න"
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr "පෙට්ටිය එක් අයිà¶à¶¸à¶ºà¶šà·’න් විහිදුවන්න"
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr "පෙට්ටිය එක් අයිà¶à¶¸à¶ºà¶šà·’න් හකුළුවන්න"
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr "සජà·à¶à·“ය"
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr "විහිදුවන්න"
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr "පුරවන්න"
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr "බොà¶à·Šà¶à¶¸à·Š à·„à·à¶©à¶œà·ƒà·Šà·€à¶±à·Šà¶±"
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/sk.po
index 7edb027,c1d8053..1f07bf4
--- a/po/sk.po
+++ b/po/sk.po
@@@ -9,9 -9,9 +9,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Slovak (http://www.transifex.com/projects/p/deadbeef-player/"
"language/sk/)\n"
"Language: sk\n"
@@@ -20,17 -20,17 +26,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "O aplikácii DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "Záznam zmien DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr ""
@@@ -87,790 -87,817 +93,829 @@@ msgstr "Znulovať predzos
msgid "Zero Bands"
msgstr "Znulovať pásma"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 deň %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dnà %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Zastavené | %d stôp | %s celkový Äas"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Pozastavené | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d stôp | %s celkový Äas"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Nový zoznam stôp"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Nový zoznam stôp (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Zlyhalo ÄÃtanie súboru PomocnÃka"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Zlyhalo naÄÃtanie súboru PomocnÃka"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Upozornenie"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Súbor"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Otvoriť súbor(y)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Pridať súbor(y)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "PridaÅ¥ prieÄinok/prieÄinky"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Pridať umiestnenie"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nový zoznam stôp"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "NaÄÃtaÅ¥ zoznam stôp"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Uložiť zoznam stôp"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_UkonÄiÅ¥"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Upraviť"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_VyÄistiÅ¥"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Vybrať všetky"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Zrušiť výber"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Invertovať výber"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Výber"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Odstrániť"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Orezať"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Nájsť"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Názov"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr ""
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Interpret"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr ""
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Náhodné"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Vlastné"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Nastavenia"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Zobraziť"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Stavový panel"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ekvalizér"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Prehrávanie"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Poradie"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Lineárne"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr ""
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr ""
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Opakovať"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Posúvať podľa prehrávanej stopy"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Kurzor podľa prehrávanej stopy"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Zastaviť po tejto stope"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr ""
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_PomocnÃk"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Záznam zmien"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr ""
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "O _aplikácii"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr ""
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Hľadať"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Zastaviť"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Prehrať"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pozastaviť"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Predošlá"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Ďalšia"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Prehrať náhodnú"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "O aplikácii"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "UkonÄiÅ¥"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "PomocnÃk"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Vlastnosti stopy"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Použiť"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Zatvoriť"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadáta"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Vlastnosti"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Názov:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Sem zadajte názov stĺpca"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Typ:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr ""
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Hrá"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Obal albumu"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Interpret - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Trvanie"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr ""
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Skupina/interpret"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Formát:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Zarovnanie:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Vľavo"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Vpravo"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Zrušiť"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Výstupný zásuvný modul:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Výstupné zariadenie:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Zvuk"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Režim replaygain:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Vypnúť"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Stopa"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Najvyššà replaygain:"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr ""
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr ""
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr ""
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Nastaviť"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr ""
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr ""
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr ""
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Zatvorenie minimalizuje do oznamovacej oblasti"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr ""
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Prekonať"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Popredie"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Pozadie"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Farby liÅ¡ty pozÃcie a hlasitosti"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Stredné"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Svetlé"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Tmavé"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Základ"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Text"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Farby pruhu kariet"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"Prekonať (nepoužije témy vzhľadu stromového zobrazenia GTK, ale urýchli "
"vykresľovanie)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Párny riadok"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Nepárny riadok"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Vybraný riadok"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Vybraný text"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Kurzor"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Farby zoznamu stôp"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Zapnúť proxy server"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Adresa proxy servera:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Port proxy servera:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Typ proxy:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "PoužÃvateľ proxy:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Heslo pre proxy:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Sieť"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -878,122 -905,128 +923,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr ""
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr ""
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Zásuvné moduly"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr ""
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ZapÃsaÅ¥ ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ZapÃsaÅ¥ ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "ZapÃsaÅ¥ APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Odstrániť ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Odstrániť ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Odstrániť APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "Verzia ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (odporúÄa sa)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "Kódovanie znakov ID3v1 (predvolené je iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ZapÃsaÅ¥ ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1001,91 -1034,100 +1052,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Interpret/album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Č. stopy"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Pridať do frontu prehrávaných"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Odstrániť z frontu prehrávaných"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Znovu naÄÃtaÅ¥ metadáta"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Odstrániť z disku"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Pridať stĺpec"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Upraviť stĺpec"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Odstrániť stĺpec"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Zoskupiť podľa"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Žiadne"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Interpret/dátum/album"
@@@ -1102,11 -1144,11 +1166,11 @@@ msgstr "
msgid "Default Audio Device"
msgstr "Predvolené zvukové zariadenie"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1114,7 -1156,7 +1178,7 @@@
msgid "Adding files..."
msgstr "Pridávajú sa súbory..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Inicializuje sa..."
@@@ -1127,140 -1169,140 +1191,150 @@@ msgid "Really close the window?
msgstr "Naozaj zatvoriť toto okno?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "KľúÄ"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "KľúÄ"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Hodnota"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr ""
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Možnosti:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help alebo -h VypÃÅ¡e túto správu PomocnÃka a skonÄÃ\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit UkonÄà prehrávaÄ\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version VypÃÅ¡e informácie o verzii a skonÄÃ\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play ZaÄne prehrávanie\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Zastavà prehrávanie\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pozastavà prehrávanie\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr ""
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Ďalšia stopa v zozname\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Predošlá stopa v zozname\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Náhodná stopa v zozname\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Pridá súbory do existujúceho zoznamu stôp\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
" --nowplaying FMT VypÃÅ¡e formátovaný názov stopy na Å¡tand. výstup\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1271,7 -1313,7 +1345,7 @@@ msgstr "
" [l] dĺžka, [n] Ä. stopy, [y] rok, [c] komentár,\n"
" [r] autorské práva, [e] uplynulo\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1280,26 -1322,24 +1354,36 @@@ msgstr "
" napr.: --nowplaying „%%a - %%t“ by malo vypÃsaÅ¥ "
"„interpret - názov“\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Predvolené"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Ãno"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Predvolené"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Ãno"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Nie"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1314,7 -1354,7 +1398,7 @@@
"Custom"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1322,7 -1362,7 +1406,7 @@@ msgstr "
"Vľavo\n"
"Vpravo"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1332,13 -1372,13 +1416,13 @@@ msgstr "
"Stopa\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1346,14 -1386,7 +1430,7 @@@ msgstr "
"2.3 (odporúÄa sa)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Nepodarilo sa nájsť súbor pixmap: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1363,7 -1396,7 +1440,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1656,7 -1689,7 +1733,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1673,111 -1706,116 +1750,116 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr ""
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr ""
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr ""
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr ""
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr ""
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr ""
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr ""
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr ""
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr ""
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr ""
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1785,89 -1823,89 +1867,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr ""
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr ""
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr ""
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr ""
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr ""
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1875,7 -1913,7 +1957,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1883,66 -1921,72 +1965,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr ""
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr ""
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr ""
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr ""
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr ""
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr ""
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr ""
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Pridať"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Nepodarilo sa nájsť súbor pixmap: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1970,27 -2014,27 +2058,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -1999,74 -2043,74 +2087,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2074,90 -2118,90 +2162,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2184,102 -2228,111 +2276,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/sl.po
index 05f778e,5cc372b..2d03227
--- a/po/sl.po
+++ b/po/sl.po
@@@ -7,9 -7,9 +7,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Slovenian (http://www.transifex.com/projects/p/deadbeef-"
"player/language/sl/)\n"
"Language: sl\n"
@@@ -19,17 -19,17 +25,17 @@@
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
"%100==4 ? 2 : 3);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "O programu DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "Dnevnik sprememb programa DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Prevajalci programa DeaDBeeF"
@@@ -86,44 -86,44 +92,52 @@@ msgstr "Ponastavi predojaÄevalnik
msgid "Zero Bands"
msgstr "Ponastavi pasove"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Predloge nastavitev"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 dan %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dni %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Zaustavljeno | %d skladb | Skupni Äas predvajanja: %s"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Premor | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -131,745 -131,772 +145,776 @@@ msgstr "
"%s%s %s| %d Hz | %d bitov | %s | %d:%02d / %s | %d skladb | Skupni Äas "
"predvajanja: %s"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Nov seznam predvajanja"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Nov seznam predvajanja (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Med branjem datoteke pomoÄi je priÅ¡lo do napake"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Datoteke pomoÄi ni mogoÄe naložiti"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Opozorilo"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Datoteka"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Odpri datoteko"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Dodaj datoteko"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Dodaj mapo"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Dodaj mesto"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nov seznam predvajanja"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Naloži seznam predvajanja"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Shrani seznam predvajanja"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_KonÄaj"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Uredi"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_PoÄisti"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Izberi vse"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "PrekliÄi izbor"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Obrni izbor"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Izbor"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Odstrani"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Obreži"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Najdi"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Naslov"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Å tevilka skladbe"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Izvajalec"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Datum"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "NakljuÄno"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Po meri"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Možnosti"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Pogled"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Vrstica stanja"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Uravnalnik"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "Pre_dvajanje"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Vrstni red"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Zaporedno"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Premešaj skladbe"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Premešaj albume"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Ponavljanje"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Drsnik sledi predvajanju"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Kazalnik sledi predvajanju"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Zaustavi po trenutni skladbi"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "SkoÄi na trenutno skladbo"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "Pomo_Ä"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "Dnevnik _sprememb"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_O programu"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Prevajalci"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Iskanje"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Zaustavi"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Predvajaj"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Premor"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Predhodna"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Naslednja"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Predvajaj nakljuÄno"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "O programu"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "KonÄaj"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "PomoÄ"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Lastnosti skladbe"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Nastavitve"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Uveljavi"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Zapri"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metapodatki"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Lastnosti"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Naslov:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Vnesite ime novega stolpca"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Vrsta:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Å tevilka skladbe"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Predvajanje"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Naslovnica albuma"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Izvajalec - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Trajanje"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Å t. skladbe"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Skupina / Izvajalec albuma"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Oblika:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Poravnava:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Levo"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Desno"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_PrekliÄi"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_V redu"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Izhodni vstavek:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Izhodna naprava:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Vedno pretvori 8-bitni zvok v 16-bitnega"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Zvok"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "ReplayGain:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "OnemogoÄeno"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Skladba"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Prilagajanje vrha ReplayGain"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "PredojaÄanje ReplayGain:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "SploÅ¡no predojaÄanje:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr "Datoteke privzeto dodaj na ta seznam predvajanja:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Ob zagonu nadaljuj prejšnjo sejo"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Med dodajanjem map ne dodaj datotek iz arhivov"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Predvajanje"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Nastavitve"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Predloga nastavitev verige DSP"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Naloži"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Ob zaprtju skrÄi v sistemsko vrstico"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Skrij ikono sistemske vrstice"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Hitrost osveževanja vmesnika:"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Besedilo nazivne vrstice med predvajanjem:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Besedilo nazivne vrstice, ko je predvajanje zaustavljeno:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "Vstavek vmesnika (zahteva ponovni zagon):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Skrij možnost »Izbriši z diska«"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Samodejno poimenuj seznam prevajanja, ko je dodana le ena mapa"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "OmogoÄi"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Barva"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Ozadje"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Barva vrstice iskanja/glasnosti"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Ozadje"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "1. obroba"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "2. obroba"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Osnova"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Besedilo"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Barva zavihkov"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "OmogoÄi (prepiÅ¡e temo GTK+, vendar pospeÅ¡i izrisovanje)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Soda vrstica"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Liha vrstica"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Izbrana vrstica"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Izbrano besedilo"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Kazalnik"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Barva seznama predvajanja"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Barve"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "OmogoÄi posredniÅ¡ki strežnik"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Naslov:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Vrata:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Vrsta:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Uporabniško ime:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Geslo:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Omrežje"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -877,122 -904,128 +922,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "RazliÄica: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Avtorske pravice"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Vstavki"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Oblika"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "NaraÅ¡ÄajoÄe"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "PadajoÄe"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Izberite vstavek DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Vstavek"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Nastavitve zapisovalnika oznak"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Zapiši ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Zapiši ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Zapiši APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Odstrani ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Odstrani ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Odstrani APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "RazliÄica ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (priporoÄeno)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "Kodiranje znakov ID3v1 (privzeto je iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Zapiši ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1000,91 -1033,100 +1051,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Izvajalec / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Å t. skladbe"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Dodaj na seznam predvajanja"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Odstrani s seznama predvajanja"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Ponovno naloži metapodatke"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Odstrani z diska"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Dodaj stolpec"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Uredi stolpec"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Odstrani stolpec"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Združi po"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Ne združi"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Izvajalec/Datum/Album"
@@@ -1101,11 -1143,11 +1165,11 @@@ msgstr "%s
msgid "Default Audio Device"
msgstr "Privzeta zvoÄna naprava"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1113,7 -1155,7 +1177,7 @@@
msgid "Adding files..."
msgstr "Dodajanje datotek ..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "ZaÄenjanje ..."
@@@ -1126,102 -1168,102 +1190,112 @@@ msgid "Really close the window?
msgstr "Ali res želite zapreti to okno?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[VeÄ vrednosti] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "KljuÄ"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "KljuÄ"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Vrednost"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Zapisovanje oznak ..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Ime:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Imena polj se ne smejo zaÄeti z »:« ali »_«"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Polja ni mogoÄe dodati"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Polje s tem imenom že obstaja."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Dodaj polje"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Odstrani polje"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Možnosti:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help ali -h IzpiÅ¡e pomoÄ (to sporoÄilo).\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit KonÄa predvajalnik.\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version IzpiÅ¡e podatke o razliÄici.\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play ZaÄne predvajanje.\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Zaustavi predvajanje.\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Prekine predvajanje.\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause ZaÄne/prekine predvajanje\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1229,51 -1271,51 +1303,51 @@@ msgstr "
" --play-pause ZaÄne predvajanje, Äe je zaustavljeno, v nasprotnem "
"primeru ga prekine.\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Naslednja skladba s seznama predvajanja.\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Predhodna skladba s seznama predvajanja.\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random NakljuÄna skladba s seznama predvajanja.\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Pripne datoteko na seznam predvajanja.\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
" --nowplaying OBLIKA Izpiše oblikovano ime trenutno predvajane skladbe.\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
" copy[r]ight, [e]lapsed\n"
msgstr ""
- " OBLIKA (zaÄnite z %%): izv[a]jalec, [t] - naslov, al[b]"
- "um,\n"
+ " OBLIKA (zaÄnite z %%): izv[a]jalec, [t] - naslov, "
+ "al[b]um,\n"
" [l] - trajanje, [n] - Å¡tevilka skladbe, [y] - leto,\n"
" [c] - opomba, avto[r]ske pravice, pr[e]teÄen Äas\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1282,28 -1324,24 +1356,36 @@@ msgstr "
" npr.: --nowplaying »%%a - %%t« izpiše »izvajalec - "
"naslov«\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " Za veÄ podatkov si oglejte http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Privzeto"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Da"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Privzeto"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Da"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Ne"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1329,7 -1367,7 +1411,7 @@@ msgstr "
"Skupina / Izvajalec albuma\n"
"Po meri"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1337,7 -1375,7 +1419,7 @@@ msgstr "
"Levo\n"
"Desno"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1347,7 -1385,7 +1429,7 @@@ msgstr "
"Skladba\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1355,7 -1393,7 +1437,7 @@@ msgstr "
"NaraÅ¡ÄajoÄe\n"
"PadajoÄe"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1363,14 -1401,7 +1445,7 @@@ msgstr "
"2.3 (priporoÄeno)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "VeÄbitne sliÄice ni mogoÄe najti: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1383,7 -1414,7 +1458,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1676,7 -1707,7 +1751,7 @@@ msgstr "Samodejna hitrost vzorÄenja (p
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1693,35 -1724,40 +1768,40 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Datoteka že obstaja. Ali jo želite prepisati?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Opozorilo pretvornika"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Prosimo, izberite kodirnik"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Napaka pretvornika"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Pretvarjanje ..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Izberite mapo ..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Predloge nastavitev kodirnika ni mogoÄe shraniti"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1729,77 -1765,77 +1809,77 @@@ msgstr "
"Preverite dovoljenja mape predloge nastavitev, izberite drugo ime ali "
"sprostite nekaj prostora na disku."
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "Predloga nastavitev s tem imenom že obstaja."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Napaka"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Dodaj nov kodirnik"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Uredi kodirnik"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Odstrani predlogo nastavitev"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Ali ste prepriÄani, da želite izbrisati izbrano predlogo nastavitev?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Kodirniki"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Dodaj vstavek v verigo DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Predloge nastavitev DSP ni mogoÄe shraniti."
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Nova predloga nastavitev DSP"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Uredi predlogo nastavitev DSP"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "Predloge nastavitev DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Izhodna mapa:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Ime izhodne datoteke:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1809,89 -1845,89 +1889,89 @@@ msgstr "
"Pripona (npr. mp3) bo pripeta samodejno.\n"
"Za privzeto vrednost (%a - %t) pustite polje prazno."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Kodirnik:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "Predloga nastavitev DSP:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Å tevilo niti:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Oblika izhodnega vzorca:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Ohrani izvirno obliko"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8-bitno predznaÄeno celo Å¡tevilo"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16-bitno predznaÄeno celo Å¡tevilo"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24-bitno predznaÄeno celo Å¡tevilo"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32-bitno predznaÄeno celo Å¡tevilo"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32-bitna plavajoÄa vejica"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Če datoteka že obstaja:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Vprašaj"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Prepiši"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Uredi predlogo nastavitev kodirnika"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Neimenovan kodirnik"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Pripona izhodne datoteke:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Na primer: mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Ukazna vrstica:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1901,7 -1937,7 +1981,7 @@@ msgstr "
"Zgled: lame - %o\n"
"%i = vhodna datoteka, %o = izhodna datoteka, - = standardni vhod"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1911,66 -1947,72 +1991,72 @@@ msgstr "
"<small>%o - ime izhodne datoteke\n"
"%i - zaÄasno ime vhodne datoteke</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "NaÄin:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Cevovod"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "ZaÄasna datoteka"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "Ogg Vorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Zapisovalnik oznak</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "Urejevalnik predlog nastavitev DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Neimenovana predloga nastavitev DSP"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Dodaj"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "VeÄbitne sliÄice ni mogoÄe najti: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1998,27 -2040,27 +2084,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2027,74 -2069,74 +2113,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2102,90 -2144,90 +2188,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2212,102 -2254,111 +2302,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/sr.po
index 153214a,0b526da..f61e414
--- a/po/sr.po
+++ b/po/sr.po
@@@ -9,9 -9,9 +9,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Serbian (http://www.transifex.com/projects/p/deadbeef-player/"
"language/sr/)\n"
"Language: sr\n"
@@@ -21,17 -21,17 +27,17 @@@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "O DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s — Дневник измена"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF преводиоци"
@@@ -88,44 -88,44 +94,52 @@@ msgstr "Претпојачало на Ð
msgid "Zero Bands"
msgstr "Подручја на нулу"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "ПоÑтавке"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 дан %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d дана %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "ЗауÑтављено | %d пеÑама | %s укупно време Ñвирања"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Моно"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Моно"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Стерео"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d ÐºÐ±Ð¿Ñ "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Паузирано | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -133,751 -133,775 +147,779 @@@ msgstr "
"%s%s %s| %d херца | %d бита | %s | %d:%02d / %s | %d пеÑама | %s укупно "
"време Ñвирања"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Ðова лиÑта"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Ðова лиÑта (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "ЛиÑта Ñа језичцима"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "ЛиÑта"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "Делитељ (горе-доле)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "Делитељ (лево-деÑно)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Језичци лиÑте"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "СвојÑтва одабраног"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Приказ омотнице албума"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Дугме"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "ÐеуÑпело читање датотеке помоћи"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "ÐеуÑпело отварање датотеке помоћи"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- "Тренутно, програм обавља позадинÑке задатке. Уколико га напуÑтите Ñада ови "
- "задаци ће бити поништени или зауÑтављени, а то може довеÑти до губитка "
- "података."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "Да ли и даље желите да изађете?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Упозорење"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Датотека"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Отвори датотеку(е)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Додај датотеку(е)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Додај директоријум(е)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Додај меÑто"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Ðова лиÑта"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Учитај лиÑту"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Сачувај лиÑту"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Излаз"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Уређивање"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "О_чиÑти"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Изабери Ñве"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Поништи избор"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Обрни избор"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Избор"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Уклони"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "ОдÑеци"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Тражи"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Сложи по"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "ÐаÑлов"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Број пеÑме"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Ðлбум"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Извођач"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Датум"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Случајно"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Прилагођено"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Подешавања"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "П_реглед"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "СтатуÑна трака"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Еквилајзер"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "Ре_продукција"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "РедоÑлед"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "ЛинијÑки"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "ÐаÑумично пеÑме"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "ÐаÑумично албуми"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Понављање"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Понављај Ñве"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Понављај пеÑму"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Без понављања"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Клизач прати репродукцију пеÑама"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Показивач прати репродукцију пеÑама"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "ЗауÑтави поÑле тренутне пеÑме"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Иди на пеÑму која Ñе репродукује"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Помоћ"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "Дневник и_змена"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "О прогр_аму"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Преводиоци"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Тражи"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "ЗауÑтави"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "ПуÑти"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Паузирај"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Претходна"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Ðаредна"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "ПуÑти наÑумично"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "О програму"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Излаз"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Помоћ"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "ОÑобине пеÑме"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "МеÑто:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Подешавања"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "С_ачувај промене"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Затвори"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Подаци о пеÑми"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "ОÑобине"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "ÐаÑлов:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "УнеÑите име за нову колону овде"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Ð’Ñ€Ñта:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Редни број"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Репродукује Ñе"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Омотнице албума"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Извођач — Ðлбум"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Трајање"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Број пеÑме"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Група / Извођач"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Формат:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Поравнање:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Лево"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "ДеÑно"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Поништи"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_У реду"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Излазни додаци:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Излазни уређај"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Увек претварај 8-битни у 16-битни аудио"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr "Увек претварај 16-битни у 24-битни звук"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Звук"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Replaygain мод:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Онемогући"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "ПеÑма"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Replaygain Ñкала вршних вредноÑти"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Replaygain претпојачавач:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Претпојачавач:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Додај датотеке из линије за наредбе или управника датотека у ову лиÑту:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Врати претходну ÑеÑију при покретању"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Ðе учитавај дадотеке из архива приликом додавања директоријума"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "Самопоништавање за „ЗауÑтави поÑле тренутне пеÑме“"
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Репродукција"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "ПодеÑи"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "ПоÑтавка за дигиталну обраду"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "У_читај"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "Дигитална обрада звука (DSP)"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Код клика на затвори ÑмеÑти у обавештајну зону"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Ðе приказуј икону у обавештајној зони"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "Омогући препознавање и Ñнимање за руÑку кодну Ñтрану CP1251"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "Омогући препознавање и Ñнимање за кинеÑку кодну Ñтрану CP936"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "ОÑвежавање приказа (колико пута у Ñекунди)"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "При репродукцији, иÑпиши на наÑловној линији: "
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "По зауÑтављеној репродукцији, иÑпиши на наÑловној линији: "
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "Додатак графичког кориÑничког интерфејÑа (неопходно поновно покретање)"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Сакриј Ñтавке \"Обриши Ñа диÑка\" у менију"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Самоименовање лиÑта пеÑама при додавању Ñамо једног директоријума"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "Графичко Ñучеље/Разно"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Замени подразумевано"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Боја текÑта"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Позадина"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Траке за премотавање/глаÑноћу"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Средње"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Светло"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Тамно"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "ОÑнова"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "ТекÑÑ‚"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Боје одвајања лиÑтова"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"Замени подразумевано (губе Ñе ГТК теме погледа Ñтабла, али Ñе добија бржи "
"приказ)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Паран ред"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr " Ðепаран ред"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Одабран ред"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Одабран текÑÑ‚"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Показивач"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Боје лиÑте"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Боје"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Омогући прокÑи Ñервер"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "ÐдреÑа прокÑи Ñервера:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Порт прокÑи Ñервера:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Тип прокÑија:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "ПрокÑи кориÑничко име:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "ПрокÑи лозинка:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Мрежа"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr "Придружене пречице таÑтатуре:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr "Радња:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr "Комбинација таÑтера:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "Опште пречице таÑтатуре"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -885,122 -909,128 +927,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "Пречице таÑтатуре"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Издање:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "ÐуторÑка права"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Додаци"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "Групиши по..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "Сложи по..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Облик:"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "РаÑтуће"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Опадајуће"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Избор додатка за дигиталну обраду"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Додатак"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Подешавања пиÑача ознака"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "УпиÑуј ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "УпиÑуј ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "УпиÑуј APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Уклони ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Уклони ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Уклони APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 верзија"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Препоручено)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 кодирање знакова (подразумевано је iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "УпиÑуј ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1008,91 -1038,100 +1056,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "Врати на подразумевано"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "Ð’Ñ€Ñта Ñадржаја:"
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "Додаци:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr "СвојÑтва дугмета"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr "Боја:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr "Боја текÑта:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr "Икона:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr "Ознака:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr "Изаберите радњу"
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Извођач / Ðлбум"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Број пеÑме"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Додај у заказано"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Уклони из заказаног"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Поново учитај податке о пеÑми"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Уклони Ñа диÑка"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Додај колону"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Уреди колону"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Уклони колону"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Групиши по"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Поништи групиÑање"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Извођач/Датум/Ðлбум"
@@@ -1109,11 -1148,11 +1170,11 @@@ msgstr "ПодеÑи %s
msgid "Default Audio Device"
msgstr "Подразумевани звучни уређај"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1121,7 -1160,7 +1182,7 @@@
msgid "Adding files..."
msgstr "Додавање датотека..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Иницијализација..."
@@@ -1134,140 -1173,140 +1195,150 @@@ msgid "Really close the window?
msgstr "Желите ли заиÑта да затворите овај прозор?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[ВишеÑтруке вредноÑти] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Кључ"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Кључ"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "ВредноÑÑ‚"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[ВишеÑтруке вредноÑти] "
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "УпиÑујем ознаке..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "Ðазив поља"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Име:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Имена поља не могу почињати знацима : или _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Ðе могу да додам поље"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Поље Ñа иÑтим именом већ поÑтоји. Дајте пољу друго име."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Додај поље"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Уклони поље"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "Употреба: deadbeef [опције] [--] [датотека(е)] \n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Опције:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help или -h Прикажи ову помоћ и изађи\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit ÐапуÑти плејер\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Прикажи инфо о верзији и изађи\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Репродукуј\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop ЗауÑтави репродукцију\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Паузирај репродукцију\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Паузирај\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
" --play-pause Започни репродукцију ако је зауÑтављена, и обратно\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Ðаредна пеÑма из лиÑте\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Претходна пеÑма из лиÑте\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random ÐаÑумично пеÑма из лиÑте\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Додај датотеку(е) у поÑтојећу лиÑту\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr " --gui ДОДÐТÐК Додатак граф. Ñучеља — подразумеван је „GTK2“\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT ИÑпиши уређено име пеÑме на Ñтд. излаз\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1278,7 -1317,7 +1349,7 @@@ msgstr "
" [l]-трајање, [n]-бр.пеÑме, [y]-година, [c]-примедба,\n"
" [r]-ауторÑка права, [e]преоÑтало време\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1287,28 -1326,24 +1358,36 @@@ msgstr "
" Ð.пр.: --nowplaying \"%%a - %%t\" ће иÑпиÑати "
"\"Извођач - ÐаÑлов\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " додатне информације на http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Подразумевано"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Да"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Подразумевано"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Да"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Ðе"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1334,7 -1369,7 +1413,7 @@@ msgstr "
"Група / Извођач\n"
"Прилагођено"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1342,7 -1377,7 +1421,7 @@@ msgstr "
"Лево\n"
"ДеÑно"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1352,7 -1387,7 +1431,7 @@@ msgstr "
"ПеÑма\n"
"Ðлбум"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1360,7 -1395,7 +1439,7 @@@ msgstr "
"РаÑтући\n"
"Опадајући"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1368,14 -1403,7 +1447,7 @@@ msgstr "
"2.3 (Препоручено)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Ðе могу пронаћи датотеку Ñа битмапираном Ñликом: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1388,8 -1416,8 +1460,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "Додај звучни диÑк"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1682,8 -1710,8 +1754,8 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "ПодеÑите произвољне наредбе љуÑке"
+ msgid "Configure Custom Shell Commands"
+ msgstr ""
#. mpgmad
#: ../translation/extra.c:99
@@@ -1700,35 -1728,40 +1772,40 @@@ msgstr "
msgid "Enable surround"
msgstr "Омогући окружујући звук"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Датотека Ñа иÑтим именом већ поÑтоји. Да ли да препишем преко ње?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Упозорење прекодера"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Одаберите кодер"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Грешка прекодера"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Прекодирам..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Одаберите директоријум..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Ðије уÑпело чување поÑтавки кодера"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1736,77 -1769,77 +1813,77 @@@ msgstr "
"Проверите дозволе директоријума за чување поÑтавки или дајте поÑтавки друго "
"име или проверите да ли имате довољно Ñлободног проÑтора на диÑку"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "ПоÑтавка Ñа иÑтим именом већ поÑтоји. Дајте поÑтавци друго име."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Грешка"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Додај нови кодер"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Уреди кодер"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Уклони поÑтавку"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Овом радњом ћете обриÑати одабрану поÑтавку. Да ли то заиÑта желите?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Кодери"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Додајте додатак у оквир за дигиталну обраду"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Ðије уÑпело чување поÑтавки за дигиталну обраду"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Ðова поÑтавка за дигиталну обраду"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Уреди поÑтавку за дигиталну обраду"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "ПоÑтавке за дигиталну обраду"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Излазни директоријум:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "Упиши у директоријум где је и изворна нумера"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "Сачувај Ñтруктуру директоријума"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Име датотеке на излазу:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1817,89 -1850,89 +1894,89 @@@ msgstr "
"За подразумевано именовање датотеке (%a - %t) \n"
"оÑтавите ово поље празним."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Кодер:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "ПоÑтавка за дигиталну обраду:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Број нити:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Излазна дубина бита узорка:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Као у изворној датотеци"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "Означена 8-битно целобројна"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "Означена 16-битно целобројна"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "Означена 24-битно целобројна"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "Означена 32-битно целобројна"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32-битно једноÑтрука"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Уколико датотека већ поÑтоји:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Питај ме"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Препиши"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Уреди поÑтавке кодера"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Ðеименован кодер"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "ÐаÑтавак имена датотеке на излазу:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Ðпр. mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Линија наредбе:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1909,7 -1942,7 +1986,7 @@@ msgstr "
"Ðа пример: lame - %o\n"
"%i за улазну датотеку, %o за излазну датотеку, - за Ñтандардни улаз (stdin)"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1919,66 -1952,72 +1996,72 @@@ msgstr "
"<small>%o - име излазне датотеке\n"
"%i - привренено име улазне датотеке</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Метод:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Цев"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Привремена датотека"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "УпиÑуј APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "УпиÑуј ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "УпиÑуј ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>ПиÑач ознака</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "Уређивач поÑтавки за дигиталну обраду"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Ðеименована поÑтавка за дигиталну обраду"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Додај"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Ðе могу пронаћи датотеку Ñа битмапираном Ñликом: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2016,27 -2055,27 +2099,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "Прилагођене наредбене линије"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "Уређивање"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "Затвори"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "Уреди наредбу"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "Ðаредба:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2047,17 -2086,17 +2130,17 @@@ msgstr "
"Произвољна наредба љуÑке — Извршиће Ñе у окружењу љуÑке из којег је и главни "
"програм покренут. Форматирање наÑлова је могуће. Ðпр: xdg-open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "ИБ:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "Слободно-дато име. Ðпр. „Моја наредба љуÑке“"
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
@@@ -2066,57 -2105,57 +2149,57 @@@ msgstr "
"ИБ наредбе је обично је врло кратак (нпр. „youtube_open“), а мора бити "
"јединÑтвен."
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "Појединачно нумере"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "Радње на нумери."
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "Више нумера"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "Радње на нумерама."
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "Локално"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "Радње Ñа датотекама на Вашем рачунару."
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "Удаљено"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "Радње Ñа удаљеним датотекама (нпр. http://нека.адреÑа.или.токови)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "Ставка ће Ñе приказати у главном менију"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2124,72 -2163,72 +2207,76 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "Додај наредбу"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "Обриши"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr "Овом радњом ћете обриÑати одабрану наредбу. Да ли то заиÑта желите?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "Потврдите уклањање"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "ИБ не може бити празан и мора бити јединÑтвен.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "Поље „ÐаÑлов“ не може бити празно\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "Поље наредбе љуÑке не може бити празно.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "неиÑправна вредноÑÑ‚"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "Подржане звучне датотеке"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "Све датотеке (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "Отвори датотеку(е)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "Додај датотеку(е) у лиÑту..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "Додај директоријум(е) у лиÑту..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "Прати меке везе"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "Обриши датотеке Ñа диÑка"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2197,19 -2236,19 +2284,19 @@@ msgstr "
"Датотеке ће бити обриÑане. Да ли Ñте Ñигурни?\n"
"(Овај дијалог може да Ñе иÑкључи у подешавањима додатка „GTKUI“)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "Учитај лиÑту"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "Друге датотеке (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "Сачувај лиÑту као"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "Датотека Ñа лиÑтом (*.dbpl)"
@@@ -2236,102 -2275,111 +2323,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr "Ðишта није изабрано."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr "Замени Ñа..."
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr "Уметни..."
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr "ИÑеци"
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr "Умножи"
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr "Убаци"
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr "Закључај померања"
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr "Помери језичак улево"
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr "Помери језичак удеÑно"
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr "Уклони језичак"
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr "Преименуј језичак"
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr "Додај нови језичак"
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr "Прикажи заглавља колона"
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr "Прошири Ð±Ð¾ÐºÑ Ñ˜ÐµÐ´Ð½Ð¾Ð¼ Ñтавком"
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr "Сузи Ð±Ð¾ÐºÑ Ð·Ð° 1 Ñтавку"
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr "ИÑтородно"
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr "Прошири"
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr "Попуни"
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr "Замени Ñа..."
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr "Уметни..."
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr "ИÑеци"
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr "Умножи"
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr "Убаци"
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr "Закључај померања"
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr "Помери језичак улево"
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr "Помери језичак удеÑно"
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr "Уклони језичак"
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr "Преименуј језичак"
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr "Додај нови језичак"
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr "Прикажи заглавља колона"
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr "Прошири Ð±Ð¾ÐºÑ Ñ˜ÐµÐ´Ð½Ð¾Ð¼ Ñтавком"
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr "Сузи Ð±Ð¾ÐºÑ Ð·Ð° 1 Ñтавку"
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr "ИÑтородно"
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr "Прошири"
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr "Попуни"
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr "ПодеÑите дугме"
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/sr at latin.po
index a1bc7f9,6b15a98..b48e21c
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@@ -9,9 -9,9 +9,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/deadbeef-"
"player/language/sr at latin/)\n"
"Language: sr at latin\n"
@@@ -21,17 -21,17 +27,17 @@@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "O DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s — Dnevnik izmena"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF prevodioci"
@@@ -88,44 -88,44 +94,52 @@@ msgstr "PretpojaÄalo na nulu
msgid "Zero Bands"
msgstr "PodruÄja na nulu"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 dan %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dana %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Zaustavljeno | %d pesama | %s ukupno vreme sviranja"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Pauzirano | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -133,748 -133,775 +147,779 @@@ msgstr "
"%s%s %s| %d herca | %d bita | %s | %d:%02d / %s | %d pesama | %s ukupno "
"vreme sviranja"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Nova lista"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Nova lista (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Neuspelo Äitanje datoteke pomoći"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Neuspelo otvaranje datoteke pomoći"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Upozorenje"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Datoteka"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Otvori datoteku(e)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Dodaj datoteku(e)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Dodaj direktorijum(e)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Dodaj mesto"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Nova lista"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "UÄitaj listu"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "SaÄuvaj listu"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Izlaz"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Uređivanje"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "O_Äisti"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Izaberi sve"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Poništi izbor"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Obrni izbor"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Izbor"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Ukloni"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Odseci"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Traži"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Naslov"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr ""
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "IzvoÄ‘aÄ"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Datum"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "SluÄajno"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Prilagođeno"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Podešavanja"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "P_regled"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Statusna traka"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ekvilajzer"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "Re_produkcija"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Redosled"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Linijski"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr ""
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr ""
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Ponavljanje"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "KlizaÄ prati reprodukciju pesama"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "PokazivaÄ prati reprodukciju pesama"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Zaustavi posle trenutne pesme"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Idi na pesmu koja se reprodukuje"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Pomoć"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "Dnevnik i_zmena"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "O progr_amu"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Prevodioci"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Traži"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Zaustavi"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Pusti"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Pauziraj"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Prethodna"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Naredna"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Pusti nasumiÄno"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "O programu"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Izlaz"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Pomoć"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Osobine pesme"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "S_aÄuvaj promene"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Zatvori"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Podaci o pesmi"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Osobine"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Naslov:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Unesite ime za novu kolonu ovde"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Vrsta:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr ""
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Reprodukuje se"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Omotnice albuma"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "IzvoÄ‘aÄ â€” Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Trajanje"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Broj pesme"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Grupa / IzvoÄ‘aÄ"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Format:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Poravnanje:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Levo"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Desno"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Poništi"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_U redu"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Izlazni dodaci:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Izlazni uređaj"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Zvuk"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Replaygain mod:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Onemogući"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Pesma"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Replaygain skala vršnih vrednosti"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Dodaj datoteke iz linije za naredbe ili upravnika datoteka u ovu listu:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Vrati prethodnu sesiju pri pokretanju"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr ""
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Reprodukcija"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Podesi"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr ""
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr ""
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr ""
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Kod klika na zatvori smesti u obaveštajnu zonu"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Ne prikazuj ikonu u obaveštajnoj zoni"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Pri reprodukciji, ispiši na naslovnoj liniji: "
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Po zaustavljenoj reprodukciji, ispiši na naslovnoj liniji: "
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Sakrij stavke \"Obriši sa diska\" u meniju"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Zameni podrazumevano"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Boja teksta"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Pozadina"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Trake za premotavanje/glasnoću"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Srednje"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Svetlo"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Tamno"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Osnova"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Tekst"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Boje odvajanja listova"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"Zameni podrazumevano (gube se GTK teme pogleda stabla, ali se dobija brži "
"prikaz)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Paran red"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr " Neparan red"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Odabran red"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Odabran tekst"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "PokazivaÄ"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Boje liste"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Boje"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Omogući proksi server"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Adresa proksi servera:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Port proksi servera:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Tip proksija:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Proksi korisniÄko ime:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Proksi lozinka:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Mreža"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -882,122 -909,128 +927,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr ""
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Autorska prava"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Dodaci"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr ""
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Upisuj ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Upisuj ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Upisuj APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Ukloni ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Ukloni ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Ukloni APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 verzija"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (PreporuÄeno)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 kodiranje znakova (podrazumevano je iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Upisuj ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1005,91 -1038,100 +1056,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "IzvoÄ‘aÄ / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Broj pesme"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Dodaj u zakazano"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Ukloni iz zakazanog"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Ponovo uÄitaj podatke o pesmi"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Ukloni sa diska"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Dodaj kolonu"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Uredi kolonu"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Ukloni kolonu"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Grupiši po"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Poništi grupisanje"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "IzvoÄ‘aÄ/Datum/Album"
@@@ -1106,11 -1148,11 +1170,11 @@@ msgstr "
msgid "Default Audio Device"
msgstr "Podrazumevani zvuÄni ureÄ‘aj"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1118,7 -1160,7 +1182,7 @@@
msgid "Adding files..."
msgstr "Dodavanje datoteka..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Inicijalizacija..."
@@@ -1131,139 -1173,139 +1195,149 @@@ msgid "Really close the window?
msgstr "Želite li zaista da zatvorite ovaj prozor?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "KljuÄ"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "KljuÄ"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Vrednost"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr ""
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Opcije:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help ili -h Prikaži ovu pomoć i izađi\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Napusti plejer\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Prikaži info o verziji i izađi\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Reprodukuj\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Zaustavi reprodukciju\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pauziraj reprodukciju\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr ""
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Naredna pesma iz liste\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Prethodna pesma iz liste\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random NasumiÄno pesma iz liste\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Dodaj datoteku(e) u postojeću listu\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Ispiši uređeno ime pesme na std. izlaz\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1274,7 -1316,7 +1348,7 @@@ msgstr "
" [l]-trajanje, [n]-br.pesme, [y]-godina, [c]-primedba,\n"
" [r]-autorska prava, [e]preostalo vreme\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1283,26 -1325,24 +1357,36 @@@ msgstr "
" N.pr.: --nowplaying \"%%a - %%t\" će ispisati "
"\"IzvoÄ‘aÄ - Naslov\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Podrazumevano"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Da"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Podrazumevano"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Da"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Ne"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1317,7 -1357,7 +1401,7 @@@
"Custom"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1325,7 -1365,7 +1409,7 @@@ msgstr "
"Levo\n"
"Desno"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1335,13 -1375,13 +1419,13 @@@ msgstr "
"Pesma\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1349,14 -1389,7 +1433,7 @@@ msgstr "
"2.3 (PreporuÄeno)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Ne mogu pronaći datoteku sa bitmapiranom slikom: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1369,7 -1402,7 +1446,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1662,7 -1695,7 +1739,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1679,111 -1712,116 +1756,116 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr ""
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr ""
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr ""
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr ""
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr ""
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr ""
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr ""
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr ""
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr ""
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr ""
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1791,89 -1829,89 +1873,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr ""
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr ""
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr ""
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr ""
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr ""
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1881,7 -1919,7 +1963,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1889,66 -1927,72 +1971,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr ""
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr ""
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr ""
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr ""
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr ""
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr ""
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr ""
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Dodaj"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Ne mogu pronaći datoteku sa bitmapiranom slikom: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1976,27 -2020,27 +2064,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2005,74 -2049,74 +2093,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2080,90 -2124,90 +2168,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2190,102 -2234,111 +2282,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/sv.po
index a24f12d,781f95a..b476e40
--- a/po/sv.po
+++ b/po/sv.po
@@@ -9,9 -9,9 +9,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Swedish (http://www.transifex.com/projects/p/deadbeef-player/"
"language/sv/)\n"
"Language: sv\n"
@@@ -20,17 -20,17 +26,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Om DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeadBeeF %s Ändrligslogg"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF översättare"
@@@ -87,793 -87,820 +93,832 @@@ msgstr "Ingen förstärkning
msgid "Zero Bands"
msgstr "Nollställ band"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Inställningar"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 dag %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d dagar %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Stoppad | %d spår | %s total speltid"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Pausad | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d spår | %s total speltid"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Ny spellista"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Ny spellista (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Misslyckades vid läsning av hjälpfil"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Kunde inte läsa hjälpfil"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Varning"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Arkiv"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Öppna fil(er)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Lägg till fil(er)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Lägg till katalog(er)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Lägg till plats"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Ny spellista"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Läs in spellista"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Spara spellista"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "A_vsluta"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Redigera"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "R_ensa"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Markera allt"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Avmarkera allt"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Invertera markering"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Markering"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Ta bort"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Beskär"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Sök"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Titel"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Spårnummer"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Artist"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr ""
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Slumpa"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Anpassad"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Egenskaper"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Visa"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Statusrad"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Equalizer"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Uppspelning"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Ordning"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Linjär"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Blanda spår"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Blanda albm"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Upprepning"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Markering följer uppspelning"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Markering följer uppspelning"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Stanna efter nuvarande"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr ""
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Hjälp"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Ändringslogg"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr ""
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Om"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr ""
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Sök"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Stopp"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Spela"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Paus"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Föregående"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Nästa"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Spela slumpad"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Om"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Avsluta"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Hjälp"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Spåregenskaper"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Verkställ"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Stäng"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadata"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Egenskaper"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Titel:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Ange ny kolumntitel här"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Typ:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr ""
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Spelar"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Albumillustration"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Artist - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Längd"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Spårnummer"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Artist"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Format:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Justering:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Vänster"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Höger"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Avbryt"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_OK"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Instick för uppspelning:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Enhet för uppspelning:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Ljud"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Läge för justering av uppspelningsvolym:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Avaktivera"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Spår"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Övre gräns för justering av uppspelningsvolym"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr ""
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Läge för justering av förstärkning:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Lägg till filer från kommandoraden (eller filhanteraren) till den här "
"spellistan:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Återuppta föregående session vid uppstart"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr ""
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Uppspelning"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Inställningar"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Inställningar för DSP-kedja"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr ""
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr ""
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Stäng minimerar till systembricka"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Dölj ikon i systembrickan"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Text i titelraden vid uppspelning:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Text u titelraden utan uppspelning:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Göm menyvalet \"radera från disk\""
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Överbrygga"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Förgrund"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Bakgrund"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Färg på sök-/volym-fält"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Mitten"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Ljus"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Mörk"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Bas"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Text"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Färg för flikrad"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"Överbrygga (GTK-baserat tema för trädvy försvinner men renderingen går "
"fortare)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Jämn rad"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Ojämn rad"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Markerad rad"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Markerad text"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Markör"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Spellistans färger"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Färger"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Aktivera proxyserver"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Adress för proxyserver:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Port för proxyserver:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Proxytyp:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Användarnamn för proxy:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Lösenord för proxy:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Nätverk"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -881,122 -908,128 +926,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr ""
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr ""
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Instick"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Format"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Välj DSP-instick"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Instick"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Inställningar för tagg-skrivare"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "Skriv ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "Skriv ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "Skriv APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Rensa ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Rensa ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Rensa APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 version"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Rekomenderad)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 teckenkodning (iso8859-1 är standard)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "Skriv ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1004,91 -1037,100 +1055,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Artist / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Spårnummer"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Lägg till i uppspelningskön"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Ta bort från uppspelningskön"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Ladda om metadata"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Ta bort från disk"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Lägg till kolumn"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Redigera kolumn"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Ta bort kolumn"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Gruppera efter"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Ingen"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Artist/Datum/Album"
@@@ -1105,11 -1147,11 +1169,11 @@@ msgstr "Inställningar för %s
msgid "Default Audio Device"
msgstr "Standardljudenhet"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1117,7 -1159,7 +1181,7 @@@
msgid "Adding files..."
msgstr "Lägger till filer..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Förbereder..."
@@@ -1130,139 -1172,139 +1194,149 @@@ msgid "Really close the window?
msgstr "Ska fönstret verkligen stängas?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Nyckel"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Nyckel"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Värde"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Lägg till fält"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Ta bort fält"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Flaggor:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help eller -h Visa hjälp (detta meddelande) och avsluta\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Stäng spelare\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Skriv ut versionsinformation och avsluta\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Påbörja uppspelning\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Stoppa uppspelning\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Pausa uppspelning\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr ""
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Nästa spår i spellista\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Föregående spår i spellista\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Slumpa spår i spellista\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Lägg till fil(er) i nuvarande spellista\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Skriv formaterat spårnamn till standard ut\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1273,7 -1315,7 +1347,7 @@@ msgstr "
" längd (l), spårnummer (n), år (y), kommentar (c),\n"
" utgiven av (r), förfluten tid (e)\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1282,26 -1324,24 +1356,36 @@@ msgstr "
" e.x.: --nowplaying \"%%a - %%t\" bör visa \"artist - "
"titel\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Standard"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Ja"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Standard"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Ja"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Nej"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1316,7 -1356,7 +1400,7 @@@
"Custom"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1324,7 -1364,7 +1408,7 @@@ msgstr "
"Vänster\n"
"Höger"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1334,13 -1374,13 +1418,13 @@@ msgstr "
"Spår\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1348,14 -1388,7 +1432,7 @@@ msgstr "
"2.3 (rekomenderad)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Kunde inte hitta pixmap-fil: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1368,7 -1401,7 +1445,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1661,7 -1694,7 +1738,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1678,111 -1711,116 +1755,116 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr ""
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr ""
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr ""
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr ""
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Välj katalog..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr ""
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr ""
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr ""
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr ""
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr ""
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1790,89 -1828,89 +1872,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr ""
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr ""
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr ""
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr ""
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr ""
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1880,7 -1918,7 +1962,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1888,66 -1926,72 +1970,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr ""
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr ""
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr ""
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr ""
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr ""
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr ""
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr ""
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Lägg till"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Kunde inte hitta pixmap-fil: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1975,27 -2019,27 +2063,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2004,74 -2048,74 +2092,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2079,90 -2123,90 +2167,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2189,102 -2233,111 +2281,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/te.po
index 48e0304,59fb84b..f3d8dbc
--- a/po/te.po
+++ b/po/te.po
@@@ -7,9 -7,9 +7,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Telugu (http://www.transifex.com/projects/p/deadbeef-player/"
"language/te/)\n"
"Language: te\n"
@@@ -18,17 -18,17 +24,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "డెడà±â€Œà°¬à±€à°«à± %s à°—à±à°°à°¿à°‚à°šà°¿"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "డెడà±â€Œà°¬à±€à°«à± %s మారà±à°ªà±à°²à°šà°¿à°Ÿà±à°Ÿà°¾"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "డెడà±â€Œà°¬à±€à°«à± à°…à°¨à±à°µà°¾à°¦à°•à±à°²à±"
@@@ -85,788 -85,815 +91,827 @@@ msgstr "à°ªà±à°°à°¿à°†à°‚పౠసà±
msgid "Zero Bands"
msgstr "à°¬à±à°°à°¾à°‚à°¡à±à°²à°¨à± à°¸à±à°¨à±à°¨à°¾à°šà±‡à°¯à°¿"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "à°ªà±à°°à°¿à°¸à±†à°Ÿà±à°²à±"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 రోజౠ%d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d రోజà±à°²à± %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "ఆపివేయబడింది | %d à°Ÿà±à°°à°¾à°•à±â€Œà°²à± | %s మొతà±à°¤à°‚ à°ªà±à°²à±‡à°Ÿà±ˆà°®à±"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "మోనో"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "మోనో"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "à°¸à±à°Ÿà±€à°°à°¿à°¯à±‹"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "నిలిపివేయబడింది | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr "%s%s %s| %dHz | %d బిటౠ| %s | %d:%02d / %s | %d à°Ÿà±à°°à°¾à°•à±â€Œà°²à± | %s మొతà±à°¤à°‚ à°ªà±à°²à±‡à°Ÿà±ˆà°®à±"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "కొతà±à°¤ పాటలజాబితా"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "కొతà±à°¤ పాటలజాబితా (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "సహాయక ఫైలà±à°¨à± à°šà°¦à±à°µà±à°¤à±à°‚à°¡à°—à°¾ విఫలమైంది"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "సహాయక ఫైలౠలోడà±à°šà±‡à°¯à±à°Ÿà°²à±‹ విఫలమైంది"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "హెచà±à°šà°°à°¿à°•"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "ఫైలౠ(_F)"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "ఫైళà±à°³(à°¨à±) తెరà±à°µà± (_O)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "ఫైళà±à°³(à°¨à±) జతచేయి"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "సంచయా(ల)నౠజతచేయి"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "à°¸à±à°¥à°¾à°¨à°®à±à°¨à± జతచేయి"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "కొతà±à°¤ పాటలజాబితా"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "పాటలజాబితానౠనింపà±"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "పాటలజాబితానౠదాచà±"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "నిషà±à°•à±à°°à°®à°¿à°‚à°šà± (_Q)"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "సవరించà±(_E)"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "à°¶à±à°à±à°°à°‚చేయి (_C)"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "à°…à°¨à±à°¨à±€ à°Žà°‚à°šà±à°•à±‹"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "ఎంపికనౠరదà±à°¦à±à°šà±‡à°¯à°¿"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "ఎంపికనౠతారà±à°®à°¾à°°à±à°šà±‡à°¯à°¿"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "ఎంపిక"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "తొలగించà±"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "à°•à°¤à±à°¤à°¿à°°à°¿à°‚à°šà±"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "à°•à°¨à±à°—ొనౠ(_F)"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "శీరà±à°·à°¿à°•"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "పాట సంఖà±à°¯"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "ఆలà±à°¬à°®à±"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "కళాకారà±à°¡à±"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "తేదీ"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "యాదృచà±à°›à°¿à°•à°‚"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "à°…à°¨à±à°°à±‚పితం"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "à°ªà±à°°à°¾à°§à°¾à°¨à±à°¯à°¤à°²à±"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "వీకà±à°·à°£à°‚ (_V)"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "à°¸à±à°¥à°¿à°¤à°¿ పటà±à°Ÿà±€"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "ఈకà±à°µà°¿à°²à±ˆà°œà°°à±"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "à°ªà±à°²à±‡à°¬à°¾à°•à±(_P)"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "à°•à±à°°à°®à°‚"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "ఒకే వరà±à°¸à°²à±‹ ఉనà±à°¨à°µà°¿"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "పాటలనౠయాదృచà±à°›à°¿à°•à°ªà°°à±à°šà±"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "ఆలà±à°¬à°®à±à°²à°¨à± యాదృచà±à°›à°¿à°•à°ªà°°à±à°šà±"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "ఆవృతీకరణ"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr ""
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr ""
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "దీని తరà±à°µà°¾à°¤ ఆపివేయి"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "తరà±à°µà°¾à°¤ పాటకి వెళà±à°³à±"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "సహాయం (_H)"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "మారà±à°ªà±à°šà°¿à°Ÿà±à°Ÿà°¾ (_C)"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "GPLv2 (_G)"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "LGPLv2.1 (_L)"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "à°—à±à°°à°¿à°‚à°šà°¿ (_A)"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "à°…à°¨à±à°µà°¾à°¦à°•à±à°²à± (_T)"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "వెతà±à°•à±"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "ఆపà±"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "à°ªà±à°²à±‡"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "నిలిపివేయి"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "à°®à±à°¨à±à°ªà°Ÿà°¿"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "తరà±à°µà°¾à°¤à°¿"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "యాదృచà±à°›à°¿à°•à°‚à°—à°¾ à°ªà±à°²à±‡à°šà±‡à°¯à°¿"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "à°—à±à°°à°¿à°‚à°šà°¿"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "నిషà±à°•à±à°°à°®à°¿à°‚à°šà±"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "సహాయం"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "à°Ÿà±à°°à°¾à°•à± లకà±à°·à°£à°¾à°²à±"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "అమరికలà±"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "à°…à°¨à±à°µà°°à±à°¤à°¿à°‚à°šà± (_A)"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "మూసివేయి (_C)"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "మెటాడేటా"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "à°—à±à°£à°®à±à°²à±"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "శీరà±à°·à°¿à°•:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "కొతà±à°¤ నిలà±à°µà±à°µà°°à±à°¸ శీరà±à°·à°¿à°•à°¨à± ఇకà±à°•à°¡ à°ªà±à°°à°µà±‡à°¶à°ªà±†à°Ÿà±à°Ÿà°‚à°¡à°¿"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "à°°à°•à°‚:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "అంశపౠసూచీ"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "à°ªà±à°²à±‡à°šà±‡à°¸à±à°¤à±à°¨à±à°¨à°¦à°¿"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "ఆలà±à°¬à°®à± à°šà°¿à°¤à±à°°à°‚"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "కళాకారà±à°¡à± - ఆలà±à°¬à°®à±"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "నిడివి"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "పాట సంఖà±à°¯"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "à°¬à±à°¯à°¾à°‚à°¡à± / ఆలà±à°¬à°®à± కళాకారà±à°¡à±"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "ఫారà±à°®à±‡à°Ÿà±:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "à°…à°¨à±à°—à±à°£à°‚:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "à°Žà°¡à°®"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "à°•à±à°¡à°¿"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿ (_C)"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "సరే (_O)"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "à°…à°µà±à°Ÿà±â€Œà°ªà±à°Ÿà± à°ªà±à°²à°—à°¿à°¨à±:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "à°…à°µà±à°Ÿà±â€Œà°ªà±à°Ÿà± పరికరం:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "à°Žà°²à±à°ªà°ªà±à°ªà±à°¡à±‚ 8 బిటౠఆడియోని 16 బిటà±â€Œà°•à°¿ పరివరà±à°¤à°¿à°‚à°šà±"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "à°§à±à°µà°¨à°¿"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "à°°à°¿à°ªà±à°²à±ˆà°—ెయినౠరీతి:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "అచేతనంచేయి"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "à°Ÿà±à°°à°¾à°•à±"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "à°°à°¿à°ªà±à°²à±ˆà°—ెయినౠపీకౠసà±à°•à±‡à°²à±"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "à°°à°¿à°ªà±à°²à±ˆà°—ెయినౠపà±à°°à±€à°†à°‚à°ªà±:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "à°—à±à°²à±‹à°¬à°²à± à°ªà±à°°à±€à°†à°‚à°ªà±:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr "ఆదేశ వరà±à°¸ (లేదా ఫైలౠనిరà±à°µà°¾à°¹à°•à°®à±) à°¨à±à°‚à°¡à°¿ ఫైళà±à°³à°¨à± à°ˆ పాటలజాబితాకౠజతచేయి"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "à°ªà±à°°à°¾à°°à°‚à°à°®à±à°²à±‹ à°®à±à°¨à±à°ªà°Ÿà°¿ కొనసాగిన కాలానà±à°¨à°¿ à°ªà±à°¨à°ƒà°ªà±à°°à°¾à°°à°‚à°à°¿à°‚à°šà±"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "సంచయాలనౠజతచేసà±à°¤à±à°¨à±à°¨à°ªà±à°¡à± సంగà±à°°à°¹à°¾à°²à°¨à± జతచేయవదà±à°¦à±"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "à°ªà±à°²à±‡à°¬à°¾à°•à±"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "à°¸à±à°µà°°à±‚పించà±"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP చైనౠపà±à°°à°¿à°¸à±†à°Ÿà±"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "నింపౠ(_L)"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr ""
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr ""
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "తిరసà±à°•à°°à°¿à°‚à°šà±"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "à°®à±à°‚à°¦à±à°à°¾à°—à°®à±"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "నేపథà±à°¯à°‚"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr ""
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr ""
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr ""
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr ""
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "పాఠà±à°¯à°‚"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr ""
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr ""
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "à°Žà°‚à°šà±à°•à±à°¨à±à°¨ à°…à°¡à±à°¡à°µà°°à±à°¸"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "à°Žà°‚à°šà±à°•à±à°¨à±à°¨ పాఠà±à°¯à°‚"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "à°•à°°à±à°¸à°°à±"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "పాటలజాబితా à°°à°‚à°—à±à°²à±"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "à°°à°‚à°—à±à°²à±"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "à°ªà±à°°à±‹à°•à±à°¸à±€ సేవికనౠచేతనపరà±à°šà±"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "à°ªà±à°°à±‹à°•à±à°¸à±€ సేవిక à°šà°¿à°°à±à°¨à°¾à°®à°¾:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "à°ªà±à°°à±‹à°•à±à°¸à±€ సేవిక పోరà±à°Ÿà±:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "à°ªà±à°°à±‹à°•à±à°¸à±€ à°°à°•à°‚:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "à°ªà±à°°à±‹à°•à±à°¸à±€ వాడà±à°•à°°à°¿à°ªà±‡à°°à±:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "à°ªà±à°°à±‹à°•à±à°¸à±€ సంకేతపదం:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "నెటà±â€Œà°µà°°à±à°•à±"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -874,122 -901,128 +919,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr ""
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr ""
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "à°ªà±à°²à°—à°¿à°¨à±â€Œà°²à±"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr ""
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ID3v2 à°µà±à°°à°¾à°¯à°¿"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ID3v1 à°µà±à°°à°¾à°¯à°¿"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "APEv2 à°µà±à°°à°¾à°¯à°¿"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr ""
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 వరà±à°·à°¨à±"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (సిఫారసà±à°šà±‡à°¯à°¬à°¡à°¿à°‚ది)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 à°…à°•à±à°·à°°à°ªà± à°Žà°¨à±â€Œà°•à±‹à°¡à°¿à°‚à°—à± (iso8859-1 అనేది à°…à°ªà±à°°à°®à±‡à°¯à°®à±)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ID3v2.4 à°µà±à°°à°¾à°¯à°¿"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -997,91 -1030,100 +1048,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "కళాకారà±à°¡à± / ఆలà±à°¬à°®à±"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "à°Ÿà±à°°à°¾à°•à± సంఖà±à°¯"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "à°ªà±à°²à±‡à°¬à°¾à°•à± వరà±à°¸à°•à± జతచేయి"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "à°ªà±à°²à±‡à°¬à°¾à°•à± వరà±à°¸ à°¨à±à°‚à°¡à°¿ తొలగించà±"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "మెటాడేటానౠమళà±à°³à±€ నింపà±"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "à°¡à°¿à°¸à±à°•à± à°¨à±à°‚à°¡à°¿ తొలగించà±"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "నిలà±à°µà±à°µà°°à±à°¸à°¨à± జతచేయి"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "నిలà±à°µà±à°µà°°à±à°¸à°¨à± సవరించà±"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "నిలà±à°µà±à°µà°°à±à°¸à°¨à± తొలగించà±"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "à°à°¦à±€à°•à°¾à°¦à±"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "కళాకారà±à°¡à±/తేదీ/ఆలà±à°¬à°®à±"
@@@ -1098,11 -1140,11 +1162,11 @@@ msgstr "
msgid "Default Audio Device"
msgstr "à°…à°ªà±à°°à°®à±‡à°¯ ఆడియా పరికరం"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1110,7 -1152,7 +1174,7 @@@
msgid "Adding files..."
msgstr "ఫైళà±à°³à°¨à± జతచేసà±à°¤à±à°¨à±à°¨à°¦à°¿..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "ఆరంà°à°¿à°¸à±à°¤à±à°¨à±à°¨à°¦à°¿..."
@@@ -1123,139 -1165,139 +1187,149 @@@ msgid "Really close the window?
msgstr "నిజంగానే విండో మూసివేయాలా?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "à°•à±€"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "à°•à±€"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "విలà±à°µ"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr ""
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "à°à°šà±à°›à°¿à°•à°¾à°²à±:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help or -h సహాయానà±à°¨à°¿ à°®à±à°¦à±à°°à°¿à°‚à°šà± (à°ˆ సందేశమà±à°¨à±) మరియౠనిషà±à°•à±à°°à°®à°¿à°‚à°šà±\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit à°ªà±à°²à±‡à°¯à°°à± à°¨à±à°‚à°¡à°¿ నిషà±à°•à±à°°à°®à°¿à°¸à±à°¤à±à°‚ది\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version వరà±à°·à°¨à± సమాచారానà±à°¨à°¿ à°®à±à°¦à±à°°à°¿à°‚à°šà°¿, నిషà±à°•à±à°°à°®à°¿à°‚à°šà±\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play à°ªà±à°²à±‡à°¬à°¾à°•à± à°ªà±à°°à°¾à°°à°‚à°à°¿à°‚à°šà±\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop à°ªà±à°²à±‡à°¬à°¾à°•à± ఆపà±à°®à±\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause à°ªà±à°²à±‡à°¬à°¾à°•à± నిలిపివేయి\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr ""
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next పాటలజాబితాలో తదà±à°ªà°°à°¿ పాట\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev పాటలజాబితాలో à°®à±à°¨à±à°ªà°Ÿà°¿ పాట\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random పాటల జాబితాలో యాదృచà±à°›à°¿à°• పాట\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue ఉనà±à°¨à°Ÿà±à°µà°‚à°Ÿà°¿ పాటలజాబితాకౠఫైళà±à°³à°¨à± జతచేయి\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1263,33 -1305,31 +1337,43 @@@
" copy[r]ight, [e]lapsed\n"
msgstr ""
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
"- title\"\n"
msgstr ""
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "à°…à°ªà±à°°à°®à±‡à°¯à°‚"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "à°…à°µà±à°¨à±"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "à°…à°ªà±à°°à°®à±‡à°¯à°‚"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "à°…à°µà±à°¨à±"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "కాదà±"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1304,7 -1344,7 +1388,7 @@@
"Custom"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1312,7 -1352,7 +1396,7 @@@ msgstr "
"à°Žà°¡à°®\n"
"à°•à±à°¡à°¿"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1322,13 -1362,13 +1406,13 @@@ msgstr "
"à°Ÿà±à°°à°¾à°•à±\n"
"ఆలà±à°¬à°®à±"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1336,14 -1376,7 +1420,7 @@@ msgstr "
"2.3 (సిఫారసà±à°šà±‡à°¯à°¬à°¡à°¿à°‚ది)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr ""
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1353,7 -1386,7 +1430,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1646,7 -1679,7 +1723,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1663,111 -1696,116 +1740,116 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr ""
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr ""
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr ""
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr ""
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr ""
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr ""
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr ""
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr ""
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr ""
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr ""
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1775,89 -1813,89 +1857,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr ""
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr ""
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr ""
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr ""
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr ""
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1865,7 -1903,7 +1947,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1873,66 -1911,72 +1955,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr ""
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr ""
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr ""
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr ""
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr ""
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr ""
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr ""
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "జతచేయి"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr ""
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1960,27 -2004,27 +2048,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -1989,74 -2033,74 +2077,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2064,90 -2108,90 +2152,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2174,102 -2218,111 +2266,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/tr.po
index 28647a6,0e1e366..adb2b42
--- a/po/tr.po
+++ b/po/tr.po
@@@ -3,15 -3,15 +3,26 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
++<<<<<<< HEAD
+# brk <burakgarci at gmail.com>, 2013
+# brk <burakgarci at gmail.com>, 2013
++=======
+ # Burak <burakgarci at gmail.com>, 2013
+ # Burak <burakgarci at gmail.com>, 2013
++>>>>>>> upstream/0.6.2
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Turkish (http://www.transifex.com/projects/p/deadbeef-player/"
"language/tr/)\n"
"Language: tr\n"
@@@ -20,17 -20,17 +31,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "DeaDBeef %s Hakkında"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s Sürüm Notları"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF'i Çevirenler"
@@@ -87,44 -87,44 +98,52 @@@ msgstr "Ön Amfiyi Sıfırla
msgid "Zero Bands"
msgstr "Bantları Sıfırla"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Önayarlar:"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 gün %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d gün %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Durduruldu | %d parça |toplam çalma zamanı: %s"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Duraklatıldı"
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -132,747 -132,774 +151,778 @@@ msgstr "
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d parça | %s toplam çalma "
"zamanı"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Yeni Çalma Listesi"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Yeni Çalma Listesi (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Sekmeli çalma listesi"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Çalma listesi"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Çalma listesi sekmeleri"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Seçim özellikleri"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Albüm kapağı görünümü"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Buton"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Yardım dosyası okunurken hata oluştu"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Yardım dosyası yüklenirken hata oluştu"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "Hala çıkmak istiyor musunuz?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Uyarı"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Dosya"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "Dosy_a(lar) aç"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Dosya(lar) ekle"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Dizin(ler) ekle"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Konum ekle"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Yeni çalma listesi"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Çalma listesi yükle"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Çalma listesini kaydet"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Çıkış"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "Düz_enle"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Temizle"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Tümünü seç"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Tüm seçimleri kaldır"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Seçimi ters çevir"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Seçim"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Kaldır"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Kes"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Bul"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Sırala"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Başlık"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Parça Numarası"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Albüm"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Sanatçı"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Tarih"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Rastgele"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Özel"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Tercihler"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Görünüm"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Durum çubuğu"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Ekolayzır"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_Oynatım"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Sıralama"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Sıralı"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Parçaları karıştır"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Albümleri karıştır"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Tekrar"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Liste takibi oynatım"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "İmleç takibi oynatım"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Çalan parçadan sonra dur"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Çalan parçaya git"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Yardım"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Sürüm notları"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Hakkında"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "Çe_virenler"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Arama"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Dur"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Çal"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Duraklat"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Önceki"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Sonraki"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Rastgele Oynatım"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Hakkında"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Çıkış"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Yardım"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Parça Özellikleri"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Ayarlar"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_Uygula"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "_Kapat"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Ãœstveri"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Özellikler"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Başlık:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Yeni sütun başlığını giriniz"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Yaz:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Öğe İndeksi"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Çalıyor"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Albüm Kapağı"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Sanatçı - Albüm"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Süre"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Parça Numarası"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Bant / Albüm Sanatçısı"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Biçim:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Hizalama:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Sol"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "SaÄŸ"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Vazgeç"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_Tamam"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Çıktı eklentisi"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Çıktı aygıtı"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "8 bit sesi her zaman 16 bite çevir"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Ses"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Ses gücü sabitleme kipi:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Devre dışı"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Parça"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Ses gücü sabitleme en yüksek limit"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "ReplayGain preamp:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Genel önamfi:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Bu çalma listesine komut satırından (veya dosya yöneticisinden) dosyalar "
"ekle:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Açılışta önceki oturum ile devam et"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Dizin eklerken arÅŸivden ekleme"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Oynatım"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Yapılandırma"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP Zinciri Önayarları"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Yükle"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Çıkışta bildirim alanına küçült"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Bildirim alanı simgesini gizle"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "Arayüz tazeleme oranı (saniyede defa)"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "Oynatım sırasındaki başlık çubuğu metni:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "Durdurulduğunda başlık çubuğu metni:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "GUI Eklentisi (yeniden başlatınca geçerli olur)"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Diskten sil girdisini\" sağ tık menüsünde\" gösterme"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Bir dizin eklendiğinde şarkı listesini otomatik isimlendir"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Üstüne bindir"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Önplan"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Arkaplan"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Gezinti-çubuğu/Ses çubuğu renkleri"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Orta"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Açık"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Koyu"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "Temel"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Metin"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Sekme ÅŸerit renkleri"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "Üstüne bindir (GTK tema görünümü kaybolur, fakat çalma hızlanır)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Tüm satırlar"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Tek satır"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Seçili satır"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Seçili metin"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "İmleç"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Çalma listesi rengi"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Renkler"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Vekil Sunucu Etkin"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "Vekil Sunucu Adresleri:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Vekil Sunucu Portu:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Vekil Türü:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Vekil Kullanıcı Adı:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Vekil Åžifresi:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "AÄŸ"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -880,122 -907,128 +930,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "Sürüm:"
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "Telif hakkı"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Eklentiler"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Biçim"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Artan"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Azalan"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "DSP Eklentisini Seçin"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Eklenti"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "Etiket Yazma Tercihleri"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ID3v2 Yaz"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ID3v1 Yaz"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "APEv2 Yaz"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "ID3v2 ÅŸeridi"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "ID3v1 ÅŸeridi"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "APEv2 ÅŸeridi"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 sürümü"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Önerilen)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 karakter kodlaması (varsayılan iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ID3v2.4 Yaz"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1003,91 -1036,100 +1059,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Sanatçı / Albüm"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Parça No"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Çalma kuyruğuna ekle"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Çalma kuyruğundan kaldır"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Üstveriyi tekrar yükle"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Diskten sil"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Sütun ekle"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Sütunu düzenle"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Sütunu kaldır"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Gruplandırma ölçütü"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Hiçbiri"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Sanatçı/Tarih/Albüm"
@@@ -1104,11 -1146,11 +1173,11 @@@ msgstr "%s'i yapılandır
msgid "Default Audio Device"
msgstr "Varsayılan Ses Aygıtı"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1116,7 -1158,7 +1185,7 @@@
msgid "Adding files..."
msgstr "Dosyalar ekleniyor..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Başlatılıyor..."
@@@ -1129,141 -1171,141 +1198,151 @@@ msgid "Really close the window?
msgstr "Pencere gerçekten kapatılsın mı?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[çoklu değerler]"
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "TuÅŸ"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "TuÅŸ"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "DeÄŸer"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "Etiketler yazılıyor..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Ä°sim:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Alan isimleri : veya _ ile baÅŸlayamaz"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Alan eklenemez"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Bu isimde bir alan mevcut, lütfen başka bir isimle tekrar deneyin."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Alan ekle"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Alan sil"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Seçenekler:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help veya -h Yardımı yazdır (bu mesajı) ve çık\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Oynatıcıyı kapat\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Sürüm bilgilerini yazdır ve çık\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Oynatımı başlat\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Oynatımı durdur\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Oynatımı duraklat\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Duraklamayı geç\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr "--play-pause Durdurulmuşsa çal, değilse duraklamayı geç\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next Çalma listesinde sonraki parça\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev Çalma listesinde önceki parça\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Çalma listesinde rastgele parça\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Çalma listesine parça(lar) ekle\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
" --nowplaying FMT Değiştirilmiş dosya adını standard çıktıya (stdout) "
"yazdır\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1274,7 -1316,7 +1353,7 @@@ msgstr "
" [u]zunluk, parça[n]umarası, [y]ıl, y[o]rum,\n"
" teli[f]hakkı, [g]eçmiş\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1283,28 -1325,24 +1362,36 @@@ msgstr "
" e.g.: --şimdi çalıyor \"%%a - %%t\" yazdırır \"sanatçı "
"- başlık\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- "daha fazla bilgi için http://sourceforge.net/apps/mediawiki/deadbeef/index."
- "php?title=Title_Formatting adresine bakabilirsiniz\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Varsayılan"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Evet"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Varsayılan"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Evet"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Hayır"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1330,7 -1368,7 +1417,7 @@@ msgstr "
"Grup / Albüm Sanatçısı\n"
"Özel"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1338,7 -1376,7 +1425,7 @@@ msgstr "
"Sol\n"
"SaÄŸ"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1348,7 -1386,7 +1435,7 @@@ msgstr "
"Parça\n"
"Albüm"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1356,7 -1394,7 +1443,7 @@@ msgstr "
"Artan\n"
"Azalan"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1364,14 -1402,7 +1451,7 @@@ msgstr "
"2.3 (Tavsiye edilen)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Resim dosyası bulunamıyor: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1384,7 -1415,7 +1464,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1677,7 -1708,7 +1757,7 @@@ msgstr "Otomatik örnekleme oranı (hed
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1694,35 -1725,40 +1774,40 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Dosya mevcut. Üzerine yazılsın mı?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "Dönüştürücü uyarısı"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Lütfen bir kodlayıcı seçin"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Dönüştürücü hatası"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "Dönüştürülüyor..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Dizin seçin..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Kodlayıcı önayarları kaydedilemedi"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1730,77 -1766,77 +1815,77 @@@ msgstr "
"Dizinin eriÅŸim izinlerini kontrol edin, baÅŸka bir isim deneyin veya yeterli "
"disk alanını boşaltın"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "Bu isimle bir önayar mevcut. Başka bir isim seçin."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Hata"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Yeni kodlayıcı ekle"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Kodlayıcıyı düzenle"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Önayarı kaldır"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Seçtiğiniz önayar silinecek. Bunu yapmak istediğinizden emin misiniz?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Kodlayıcılar"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "DSP zincirine eklenti ekle"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "DSP önayarı kaydedilemedi"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Yeni DSP Önayarı"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "DSP Önayarını Düzenle"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP Önayarları"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Çıktı dizini:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Çıktı dosya adı:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1810,89 -1846,89 +1895,89 @@@ msgstr "
"Dosya uzantısı (.mp3 gibi) otomatik olarak eklenecektir.\n"
"Öntanımlı olanı kullanmak için bu alanı boş bırakın (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Kodlayıcı:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP önayarı:"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "Thread sayısı:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Çıktı örneği biçimi:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Kaynak biçimini koru"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 bit signed int"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 bit signed int"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 bit signed int"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 bit signed int"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 bit float"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Dosya mevcut olduÄŸunda:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Ä°stem"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "Üstüne yaz"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Kodlayıcının Önayarlarını Düzenle"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "İsimsiz Kodlayıcı"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Oluşacak dosyanın uzantısı:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "mp3 gibi"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Komut satırı:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1903,7 -1939,7 +1988,7 @@@ msgstr "
"girdi dosyası için %i, çıktı dosyası için %o, stdin (standard girdi) için - "
"for"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1913,66 -1949,72 +1998,72 @@@ msgstr "
"<small>%o - oluşacak dosyanın adı\n"
"%i - geçici girdi dosyasının adı</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Yöntem:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Boru"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "Geçici dosya"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>Etiket yazıcı</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "DSP Önayar Düzenleyicisi"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "İsimsiz DSP Önayarı"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Ekle"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Resim dosyası bulunamıyor: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2000,27 -2042,27 +2091,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2029,74 -2071,74 +2120,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2104,90 -2146,90 +2195,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2214,102 -2256,111 +2309,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/ug.po
index 7b8e9fd,eea0e47..09cc4a1
--- a/po/ug.po
+++ b/po/ug.po
@@@ -7,9 -7,9 +7,15 @@@ msgid "
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Uighur (http://www.transifex.com/projects/p/deadbeef-player/"
"language/ug/)\n"
"Language: ug\n"
@@@ -18,17 -18,17 +24,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "DeaDBeeF %s ھەققىدە"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s نى ئۆزگەرتىش خاتىرىسى"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF تەرجىمانلىرى"
@@@ -85,44 -85,44 +91,52 @@@ msgstr "ئالدىن كۈچەيتىشن
msgid "Zero Bands"
msgstr "بەلۋاغلارنى نۆل قىلىش"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "ئالدىن تەÚشەشلەر"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 ÙƒÛˆÙ† %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d ÙƒÛˆÙ† %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "توختىغان | %d نەغمە | %s جەمئىي قويۇش ۋاقتى"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "يەككە يوللۇق ئاۋاز"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "يەككە يوللۇق ئاۋاز"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "ستÛرÛئو"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "ۋاقىتلىق توختىدى | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -130,749 -130,776 +144,780 @@@ msgstr "
"%s%s %s| %d Ú¯Ûرتس | %d بىت | %s | %d:%02d / %s | %d نەغمە | %s جەمئىي قويۇش "
"ۋاقتى"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "ÙŠÛÚÙ‰ قويۇش تىزىمى"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "ÙŠÛÚÙ‰ قويۇش تىزىمى(%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "ياردەم ھۆججىتىنى ئوقۇۋاتقاندا مەغلۇپ بولدى"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "ياردەم ھۆججىتىنى ئوقۇش مەغلۇپ بولدى."
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "ئاگاھلاندۇرۇش"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "ھۆججەت(_F)"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "ھۆججەت(لەر)نى ئاچ(_O)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "ھۆججەت(لەر)نى قوشۇش"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "قىسقۇچ(لار)نى قوشۇش"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "ئورۇن قوشۇش"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "ÙŠÛÚÙ‰ قويۇش تىزىمى"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "قويۇش تىزىمىنى ئوقۇش"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "قويۇش تىزىمىنى ساقلاش"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "Ú†Ûكىن(_Q)"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "تەھرىر(_E)"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "تازىلا(_C)"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "ھەممىنى تاللا"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "ھەممىنى تاللىما"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "تاللاشنى ئۆرۈ"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "تاللانما"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "چىقىرىۋەت"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "قىرقىش"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "ئىزدە(_F)"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr ""
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "ماۋزۇ"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "ناخشا نومۇرى"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "ئالبوم"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "ئورۇنلىغۇچى"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Ú†Ûسلا"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "قالايمىقان"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "ئىختىيارى"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "مايىللىق"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "كۆرۈنۈش(_V)"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "ھالەت بالدىقى"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "تەÚشىگۈچ"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "قوي(_P)"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "تەرتىپلە"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "سىزىقلىق"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "نەغمىنى تەرتىپسىز قويۇش"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "ئالبومنى تەرتىپسىز قويۇش"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "قايتىلاۋاتىدۇ"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr ""
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr ""
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr ""
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "سىيرىغۇچ قويۇۋاتقىنىغا ئەگەشسۇن"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "نۇربەلگە قويۇۋاتقىنىغا ئەگەشسۇن"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "ھازىرقىسى تاماملانغاندا توختىتىش"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "نۆۋەتتىكى نەغمىگە سەكرەش"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "ياردەم(_H)"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "ئۆزگىرىش خاتىرىسى(_C)"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "ھەققىدە(_A)"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "تەرجىمانلار(_T)"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "ئىزدە"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "توختا"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "قوي"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "ۋاقىتلىق توختا"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "ئالدىنقى"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "ÙƒÛيىنكى"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "تەرتىپسىز قويۇش"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "ھەققىدە"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "ئاخىرلاشتۇرۇش"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "ياردەم"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "نەغمە خاسلىقى"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr ""
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "تەÚشەكلەر"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "قوللان(_A)"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "ياپ(_C)"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Ù…Ûتا سانلىق-مەلۇماتى"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "خاسلىق"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "ماۋزۇ:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "ÙŠÛÚÙ‰ ئىستون ماۋزۇسىنى بۇ يەرگە كىرگۈزۈÚ"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "تىپى:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "تۈر ئىندÛكسى"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "قويۇۋاتىدۇ"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "ئالبوم مۇقاۋىسى"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "ئورۇنلىغۇچى - ئالبوم"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "ۋاقتى"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "نەغمە نومۇرى"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "مۇزىكا ئەترىتى / ئالبوم ئورۇنلىغۇچى"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "پىچىم:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "توغرىلاش:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "سول"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "ئوÚ"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "ئەمەلدىن قالدۇر(_C)"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "جەزملە(_O)"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "چىقىرىش قىستۇرمىسى:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "چىقىرىش ئۈسكۈنىسى:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "8 بىتلىق ئۈننى ھەمىشە 16 بىتلىق ئۈنگە ئايلاندۇرۇش"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "ئاۋاز"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Replaygain ھالىتى:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "ئىناۋەتسىز"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "نەغمە"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "قويۇشنى كۈچەيتىش Ù…Ù‰Ù‚Ø¯Ø§Ø±Ù‰Ù†Ù‰Ú Ø¦Û•Ú Ú†ÙˆÚ Ù‚Ù‰Ù…Ù…Ù‰ØªÙ‰Ù†Ù‰ تەÚØ´Û•Ø´"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "قويۇش مىقدارىنى ئالدىن كۈچەيتىش:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "ئومۇمىي ئالدىن كۈچەيتىش:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"بۇيرۇق قۇرىدىن(ياكى ھۆججەت باشقۇرغۇدىن) ھۆججەت(لەر)نى بۇ قويۇش تىزىمىغا "
"قوشۇش:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "باشلانغاندا ئالدىنقى ئەÚگىمەنى داۋام قىلسۇن"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "قىسقۇچتىن قوشۇۋاتقاندا ئارخىپتىن قوشما"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "قويۇش"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "سەپلە"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP Ø²Û•Ù†Ø¬Ù‰Ø±Ù‰Ù†Ù‰Ú Ø¦Ø§Ù„Ø¯Ù‰Ù† تەÚشىشى"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "يۈكلە(_L)"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "كۆزنەك ÙŠÛپىلغاندا سىستÛما قوندىقىغا كىرسۇن"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "سىستÛما قونداق سىنبەلگىسىنى يوشۇر"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "كۆرۈنمەيۈزنى ÙŠÛÚىلاش تÛزلىكى(ھەر سÛكۇنتتىكى Ù‚Ûتىم سانى)"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "قويۇۋاتقان چاغدىكى ماۋزۇ بالدىقى تÛكىستى:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "توختىغان چاغدىكى ماۋزۇ بالدىقى تÛكىستى:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "GUI قىستۇرمىسى (ئۆزگەرتىلگەندىن ÙƒÛيىن قايتا باشلاش زۆرۈر):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "«دىسكىدىن ئۇچۇر» دÛÚ¯Û•Ù† مەزمۇن تىزىملىك تۇرىنى يوشۇر"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "يەككە مۇندەرىجە قوشۇلغاندا قويۇش ØªÙ‰Ø²Ù‰Ù…Ù‰Ù†Ù‰Ú Ø¦Ø§ØªÙ‰Ù†Ù‰ ئاپتوماتىك بەلگىلە"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "قاپلاش"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "ئالدى كۆرۈنۈش"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "تەگلىك"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "ئىزدەش بالدىقى/ئاۋاز Ú†ÙˆÚلۇقى بالدىقى"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "ئوتتۇرا"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "ئاق"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "قارا"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "ئاساسى"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "تÛكىست"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Ø¨Û•ØªÙƒÛˆÚ†Ù†Ù‰Ú Ø±Û•ÚÚ¯Ù‰"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"قاپلاش(GTK Ù†Ù‰Ú Ø¯Û•Ø±Û•Ø®Ø³Ù‰Ù…Ø§Ù† ÙƒÛ†Ø±ÛˆÙ†ÛˆØ´Ù‰Ù†Ù‰Ú Ø¦Û†Ø±Ù†Ù‰ÙƒÙ‰ يوقىلىدۇ، بىراق سىزىش تÛزلىكى "
"تÛزلىشىدۇ)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "جۈپ قۇر"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "تاق قۇر"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "تاللانغان قۇر"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "تاللانغان تÛكىست"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "نۇربەلگە"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "قويۇش ØªÙ‰Ø²Ù‰Ù…Ù‰Ù†Ù‰Ú Ø±Û•Úلىرى"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "رەÚلەر"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "ۋاكالەتچى مۇلازىمÛتىرنى ئىناۋەتلىك قىلىش"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "ۋاكالەتچى مۇلازىمÛØªÙ‰Ø±Ù†Ù‰Ú Ø¦Ø§Ø¯Ø±Ûسى:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "ۋاكالەتچى مۇلازىمÛØªÙ‰Ø±Ù†Ù‰Ú Ø¦Ûغىزى:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Û‹Ø§ÙƒØ§Ù„Û•ØªÚ†Ù‰Ù†Ù‰Ú ØªÙ‰Ù¾Ù‰:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Û‹Ø§ÙƒØ§Ù„Û•ØªÚ†Ù‰Ù†Ù‰Ú Ø¦Ù‰Ø´Ù„Û•ØªÙƒÛˆÚ†Ù‰ ئاتى:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "ۋاكالەتچى ئىمى:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "تور"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -880,122 -907,128 +925,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "نەشرى: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "نەشر ھوقۇقى"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "قىستۇرما"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "پىچىمى"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "ئۆسكۈچى"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "ÙƒÛÙ…Û•ÙŠÚ¯ÛˆÚ†Ù‰"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "DSP قىستۇرمىسىنى تاللاش"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "قىستۇرما"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "خەتكۈش يازغۇچ تەÚشىكى"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ID3v2 نى ÙŠÛزىش"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ID3v1 نى ÙŠÛزىش"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "APEv2 نى ÙŠÛزىش"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "ID3v2 نى ئۆچۈرۈۋÛتىش"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "ID3v1 نى ئۆچۈرۈۋÛتىش"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "APEv2 نى ئۆچۈرۈۋÛتىش"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 نەشرى"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (تەۋسىيە قىلىنىدۇ)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 ھەرپ كودلىشى (ÙƒÛ†Úۈلدىكى قىممىتى iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ID3v2.4 نى ÙŠÛزىش"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1003,91 -1036,100 +1054,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "ئورۇنلىغۇچى / ئالبوم"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "نەغمە نومۇرى"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "قويۇش قاتارىغا قوشۇش"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "قويۇش قاتارىدىن چىقىرىۋÛتىش"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Ù…Ûتا سانلىق-مەلۇماتنى قايتا ئوقۇش"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "دىسكىدىن چىقىرىۋÛتىش"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "ئىستون قوشۇش"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "ئىستون تەھرىرلەش"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "ئىستوننى ئۆچۈر"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "گۇرۇپپىلاش"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "يوق"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "ئورۇنلىغۇچى/Ú†Ûسلا/ئالبوم"
@@@ -1104,11 -1146,11 +1168,11 @@@ msgstr "%s نى سەپلەش
msgid "Default Audio Device"
msgstr "ÙƒÛ†Úۈلدىكى ئۇن ئۈسكۈنىسى"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1116,7 -1158,7 +1180,7 @@@
msgid "Adding files..."
msgstr "ھۆججەتلەرنى قوشۇۋاتىدۇ…"
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "دەسلەپلەشتۈرۈۋاتىدۇ…"
@@@ -1129,102 -1171,102 +1193,112 @@@ msgid "Really close the window?
msgstr "كۆزنەكنى راستلا ياپامسىز؟"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[بىر قانچە قىممەت] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "ئاچقۇچ"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "ئاچقۇچ"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "قىممەت"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "خەتكۈچلەرنى ÙŠÛزىۋاتىدۇ…"
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "ئاتى:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "سوز بۆلىكى ئاتى : ياكى _ بىلەن باشلانماسلىقى ÙƒÛرەك"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "سوز بۆلىكى قوشقىلى بولمىدى"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "بۇنداق ئاتى بار سوز بۆلىكى مەۋجۇت، باشقا ئاتنى سىناپ كۆرۈÚ."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "سوز بۆلىكى قوشۇش"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "سوز بۆلىكىنى چىقىرىۋÛتىش"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "تاللانمىلار:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help ياكى -h مۇشۇ ياردەمنى كۆرسىتىپ ئاخىرلىشىدۇ\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit قويغۇنى ئاخىرلاشتۇرىدۇ\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version نەشر ئۇچۇرىنى بÛسىپ چىقىرىپ ئاخىرلىشىدۇ\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play قويۇشنى باشلايدۇ\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop قويۇشنى توختىتىدۇ\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause قويۇشنى ۋاقىتلىق توختىتىدۇ\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause ۋاقىتلىق توختىتىشنى ئالماشتۇرىدۇ\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1232,40 -1274,40 +1306,40 @@@ msgstr "
" --play-pause قويۇۋاتقان بولسا ۋاقىتلىق توختىتىدۇ، باشقا ھالەتنىمۇ "
"ۋاقىتلىق توختىتىدۇ\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next قويۇش تىزىمىدىكى ÙƒÛيىنكى ناخشا\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev قويۇش تىزىمىدىكى ئالدىنقى ناخشا\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random قويۇش تىزىمىدىكى ناخشىنى تەرتىپسىز قويىدۇ\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue ھۆججەت(لەر) نى قويۇش تىزىمىغا قوشىدۇ\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
- " --nowplaying FMT پىچىلغان نەغمە ئاتىنى ئۆلچەملىك چىقىرىش ئۈسكۈنىسى"
- "(stdout) غا چىقىرىدۇ\n"
+ " --nowplaying FMT پىچىلغان نەغمە ئاتىنى ئۆلچەملىك چىقىرىش "
+ "ئۈسكۈنىسى(stdout) غا چىقىرىدۇ\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1276,7 -1318,7 +1350,7 @@@ msgstr "
" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
" copy[r]ight, [e]lapsed\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1285,28 -1327,24 +1359,36 @@@ msgstr "
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
"- title\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " تÛخىمۇ كوپ ئۇچۇرلار ئۈچۈن http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting Ú¯Û• قاراÚ\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "ÙƒÛ†Úۈلدىكى"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "ھەئە"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "ÙƒÛ†Úۈلدىكى"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "ھەئە"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "ياق"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1332,7 -1370,7 +1414,7 @@@ msgstr "
"مۇزىكا ئەترىتى / ئورۇنلىغۇچى\n"
"ئىختىيارىي"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1340,7 -1378,7 +1422,7 @@@ msgstr "
"سول\n"
"ئوÚ"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1350,13 -1388,13 +1432,13 @@@ msgstr "
"نەغمە\n"
"ئالبوم"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr "Ú†ÙˆÚىيىش/كىچىكلەش"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1364,14 -1402,7 +1446,7 @@@ msgstr "
"2.3 (تەۋسىيە قىلىنىدۇ)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "pixmap ھۆججىتىنى تاپقىلى بولمىدى: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1384,7 -1415,7 +1459,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1678,7 -1709,7 +1753,7 @@@ msgstr "ئاپتوماتىك ئەۋرى
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1695,35 -1726,40 +1770,40 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "مەزكۇر ھۆججەت مەۋجۇت. قاپلامسىز؟"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "ئايلاندۇرغۇچ ئاگاھلاندۇرۇشى"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "كودلىغۇچ تاللاÚ"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "ئايلاندۇرغۇچ خاتالىقى"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "ئايلاندۇرۇۋاتىدۇ…"
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "قىسقۇچ تاللاش…"
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "كودلىغۇچ ئالدىن تەÚشىشىنى ساقلاش مەغلۇپ بولدى"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1731,77 -1767,77 +1811,77 @@@ msgstr "
"ئالدىن تەÚØ´Û•Ø´ Ù‚Ù‰Ø³Ù‚Û‡Ú†Ù‰Ù†Ù‰Ú Ø¦Ù‰Ù…ØªÙ‰ÙŠØ§Ø²Ù„Ù‰Ø±Ù‰Ù†Ù‰ تەكشۈرۈÚØŒ باشقا ماۋزۇ ØªØ§Ù„Ù„Ø§Ú ÙŠØ§ÙƒÙ‰ "
"دىسكىنى ئازراق بىكارلاÚ"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "ئوخشاش ئاتلىق ئالدىن تەÚØ´Û•Ø´ مەۋجۇت. باشقا بىرنى تاللاÚ."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "خاتالىق"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "ÙŠÛÚÙ‰ كودلىغۇچ قوشۇش"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "كودلىغۇچ تەھرىرلەش"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "ئالدىن تەÚشەشنى چىقىرىۋÛتىش"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "بۇ مەشغۇلاتتا تاللانغان ئالدىن تەÚØ´Û•Ø´ ئۆچۈرۈلىدۇ. راستلا ئۆچۈرەمسىز؟"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "كودلىغۇچ"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "ÙŠÛÚÙ‰ قىستۇرمىنى DSP زەنجىرىگە قوشۇش"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "DSP ئالدىن تەÚشىشىنى ساقلاش مەغلۇپ بولدى"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "ÙŠÛÚÙ‰ DSP ئالدىن تەÚشىشى"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "DSP ئالدىن تەÚشىشىنى تەھرىرلەش"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP ئالدىن تەÚشەشلىرى"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "چىقىرىش قىسقۇچى:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "چىقىرىش Ú¾Û†Ø¬Ø¬Ù‰ØªÙ‰Ù†Ù‰Ú Ø¦Ø§ØªÙ‰:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1811,89 -1847,89 +1891,89 @@@ msgstr "
"ÙƒÛÚەيتىلمە ئاتى (.mp3 دÛگەندەك) ئاپتوماتىك قوشۇلىدۇ.\n"
"قۇرۇق بولسا ÙƒÛ†Úۈلدىكىسى ئىشلىتىلىدۇ (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "كودلىغۇچ:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP ئالدىن تەÚشىشى"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "جەريان(threads) سانى:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "چىقىرىش Ø¦Û•Û‹Ø±Ù‰Ø´ÙƒÙ‰Ø³Ù‰Ù†Ù‰Ú Ù¾Ù‰Ú†Ù‰Ù…Ù‰:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Ù…Û•Ù†Ø¨Û•Ù†Ù‰Ú Ù¾Ù‰Ú†Ù‰Ù…Ù‰Ø¯Û•Ùƒ بولسۇن"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 بىتلىق ئالامىتى بار پۈتۈن سان"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 بىتلىق ئالامىتى بار پۈتۈن سان"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 بىتلىق ئالامىتى بار پۈتۈن سان"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 بىتلىق ئالامىتى بار پۈتۈن سان"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 بىتلىق لەيلىمە كەسىر سان"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "ھۆججەت مەۋجۇت بولسا:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "ئەسكەرتىش"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "قاپلاش"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "كودلىغۇچ ئالدىن تەÚشىشىنى تەھرىرلەش"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "ماۋزۇسىز كودلىغۇچ"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "چىقىرىش Ú¾Û†Ø¬Ø¬Ù‰ØªÙ‰Ù†Ù‰Ú ÙƒÛÚەيتىلمە ئاتى:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "يەنى mp3 دÛگەندەك"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "بۇيرۇق قۇرى:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1903,7 -1939,7 +1983,7 @@@ msgstr "
"مىسال: lame - %o\n"
"%i كىرىش ھۆججىتى، %o چىقىرىش ھۆججىتى, - for stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1913,66 -1949,72 +1993,72 @@@ msgstr "
"<small>%o - چىقىرىش Ú¾Û†Ø¬Ø¬Ù‰ØªÙ‰Ù†Ù‰Ú Ø¦Ø§ØªÙ‰\n"
"%i - ۋاقىتلىق كىرگۈزۈش Ú¾Û†Ø¬Ø¬Ù‰ØªÙ‰Ù†Ù‰Ú Ø¦Ø§ØªÙ‰</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "ئۇسۇل:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "تۇرۇبا"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "ۋاقىتلىق ھۆججەت"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>خەتكۈش يازغۇچ</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "DSP ئالدىن تەÚشىكىنى تەھرىرلىگۈچ"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "نامسىز DSP ئالدىن تەÚشىشى"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "قوش"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "pixmap ھۆججىتىنى تاپقىلى بولمىدى: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2010,27 -2052,27 +2096,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2039,74 -2081,74 +2125,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2114,90 -2156,90 +2200,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2224,102 -2266,111 +2314,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/uk.po
index da7755d,3c01c0f..4e8388f
--- a/po/uk.po
+++ b/po/uk.po
@@@ -3,14 -3,15 +3,21 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+ # Maks Lyashuk <m_lyashuk at ukr.net>, 2014
# Yarema aka Knedlyk <yupadmin at gmail.com>, 2010
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/deadbeef-"
"player/language/uk/)\n"
"Language: uk\n"
@@@ -20,17 -21,17 +27,17 @@@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Про DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s СпиÑок Змін"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "Перекладачі DeaDBeeF"
@@@ -87,44 -88,44 +94,52 @@@ msgstr "Скинути підÑилен
msgid "Zero Bands"
msgstr "Скинути чаÑтоти на нуль"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Типові значеннÑ"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 день %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d дні %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Зупинено | %d треків | %s повна триваліÑÑ‚ÑŒ програваннÑ"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Моно"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Моно"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Стерео"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps"
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Ðа паузі |"
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@@ -132,748 -133,776 +147,780 @@@ msgstr "
"%s%s %s| %dГц | %d біт | %s | %d:%02d / %s | %d треків | %s повна триваліÑÑ‚ÑŒ "
"програваннÑ"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Ðовий ÑпиÑок програваннÑ"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Ðовий ÑпиÑок Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð²Ð°Ð½Ð½Ñ (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
- msgstr ""
+ msgstr "СпиÑок програваннÑ"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr ""
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
- msgstr ""
+ msgstr "Показ обкладинки альбому"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
- msgstr ""
+ msgstr "Спектр"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr "Панель гучноÑÑ‚Ñ–"
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Ðевдача при читанні файлу допомоги"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Ðе можу прочитати файл допомоги"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
- msgstr ""
+ msgstr "Ви доÑÑ– хочете вийти?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "ПопередженнÑ"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Файл"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Відкрити файл(и)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Додати файл(и)"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Додати теку(и)"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Додати URL-поÑиланнÑ"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Ðовий ÑпиÑок програваннÑ"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Завантажити ÑпиÑок програваннÑ"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "Зберегти ÑпиÑок програваннÑ"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "_Закінчити"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Редагувати"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_ОчиÑтити"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Вибрати вÑе"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Забрати Ð²Ð¸Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ Ð²Ñього"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Інвертувати виділеннÑ"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Вибір"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Вилучити"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Вилучити невиділене"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "_Знайти"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
- msgstr ""
+ msgstr "Сортувати за"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Ðазва"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Ðомер треку"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Ðльбом"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Виконавець"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Дата"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Випадково"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "КориÑтувацьке"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Параметри"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_ВиглÑд"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Ð Ñдок Ñтану"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Еквалайзер"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr ""
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "_ПрограваннÑ"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "ПорÑдок"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Одне за одним"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Перемішати треки"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Перемішати треки"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Повторювати"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
- msgstr ""
+ msgstr "Повторювати вÑе"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
- msgstr ""
+ msgstr "Повторювати одну піÑню"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
- msgstr ""
+ msgstr "Ðе повторювати"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Прокручувати поточну піÑню"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "ВиділÑти поточну піÑню"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Зупинити піcÐ»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr "Зупинити піÑÐ»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ треку"
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr "Зупинити піÑÐ»Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ альбому"
+
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "ПереÑкочити на поточний трек"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "_Допомога"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Впроваджені зміни"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "_Про"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Перекладачі"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Пошук"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Стоп"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Програвати"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Пауза"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "Попереднє"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "ÐаÑтупне"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Програвати випадково"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Про"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Вийти"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Допомога"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "ВлаÑтивоÑÑ‚Ñ– треків"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
- msgstr ""
+ msgstr "РозташуваннÑ:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "ÐалаштуваннÑ"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "_ЗаÑтоÑувати"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "З_акрити"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Метадані"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "ВлаÑтивоÑÑ‚Ñ–"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Ðазва:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Введіть назву нової колонки тут"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Тип:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "ІндекÑ"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "ПрограваннÑ"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Обкладинка альбому"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Виконавець - Ðльбом"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "ТриваліÑÑ‚ÑŒ"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Ðомер треку"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Гурт / Ðльбом Виконавець"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Формат:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "ВирівнюваннÑ:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "По лівому краю"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "По правому краю"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_СкаÑувати"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "_ОК"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Плагін виводу:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "ПриÑтрій виводу:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Завжди конвертувати 8 біт аудіо до 16 біт"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
- msgstr ""
+ msgstr "Завжди конвертувати 16-бітне аудіо до 24-бітного"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Звук"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Режим Ð°Ð²Ñ‚Ð¾Ð²Ð¸Ñ€Ñ–Ð²Ð½ÑŽÐ²Ð°Ð½Ð½Ñ Ð³ÑƒÑ‡Ð½Ð¾ÑÑ‚Ñ–:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Виключити"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "Трек"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "ВикориÑтовувати пікове значеннÑ"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 дБ"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 дБ"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Режим Ð°Ð²Ñ‚Ð¾Ð²Ð¸Ñ€Ñ–Ð²Ð½ÑŽÐ²Ð°Ð½Ð½Ñ Ð³ÑƒÑ‡Ð½Ð¾ÑÑ‚Ñ–:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Глобальне вирівнюваннÑ"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr ""
"Додати файли з командної Ñтрічки (або менеджера файлів) до цього ÑпиÑку "
"програваннÑ:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Відновити попередню ÑеÑÑ–ÑŽ на Ñтарті"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Ðе додавати з архіву при додаванні тек"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "ПрограваннÑ"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Ðалаштувати"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "Типові Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð»Ð°Ð½Ñ†ÑŽÐ³Ð° DSP"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_ЗавантаженнÑ"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Закрити мінімізує до ÑиÑÑ‚. лотка"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Ховати іконку ÑиÑтемного лотка"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
- msgid "Enable Russian CP1251 detection and recoding"
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
+ msgid "Enable Russian CP1251 detection and recoding"
+ msgstr "Увімкнути виÑÐ²Ð»ÐµÐ½Ð½Ñ Ñ‚Ð° Ð´ÐµÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¸Ñ€Ð¸Ð»Ð¸Ñ†Ñ– CP1251"
+
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
- msgstr ""
+ msgstr "Увімкнути виÑÐ²Ð»ÐµÐ½Ð½Ñ Ñ‚Ð° Ð´ÐµÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¸Ñ‚Ð°Ð¹Ñької CP936"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "ЧаÑтота Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñу (разів за Ñекунду)"
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "ТекÑÑ‚ заголовку панелі під Ñ‡Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð²Ð°Ð½Ð½Ñ:"
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "ТекÑÑ‚ заголовку панелі під Ñ‡Ð°Ñ Ð¿Ñ€Ð¸Ð·ÑƒÐ¿Ð¸Ð½ÐµÐ½Ð½Ñ:"
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "Додаток GUI (Ð´Ð»Ñ Ð·Ð¼Ñ–Ð½ потрібно перезавантажити):"
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
- msgstr ""
+ msgstr "Програвач"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
- msgstr ""
+ msgstr "Закривати ÑпиÑок Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð²Ð°Ð½Ð½Ñ Ñередньою клавішею миші"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
- msgstr ""
+ msgstr "ВикориÑтовувати жирний шрифт Ð´Ð»Ñ Ñ‚Ñ€ÐµÐºÑƒ, що програєтьÑÑ"
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Ховати пункт контекÑтного меню \"Вилучити з диÑку\""
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "Ðвтоматично назвати ÑпиÑок Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸ додаванні одної теки"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
+ "Ðвтоматично підлаштовувати розміри колонок в залежноÑÑ‚Ñ– від розміру вікна"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
- msgstr ""
+ msgstr "GUI / Різне"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "ПерезапиÑати"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Передній план"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Тло"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Кольори Ð Ñдка Пошуку/РегулÑтора ГучноÑÑ‚Ñ–"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Середньо"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Легко"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Темно"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "ОÑновний"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "ТекÑÑ‚"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "Кольори Ñмужки вкладок"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
"ПерезапиÑати (втрачаютьÑÑ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ GTK, але пришвидшуєтьÑÑ Ð²Ñ–Ð·ÑƒÐ°Ð»Ñ–Ð·Ð°Ñ†Ñ–Ñ)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Парний Ñ€Ñдок"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Ðепарний Ñ€Ñдок"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Вибраний Ñ€Ñдок"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Вибраний текÑÑ‚"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "КурÑор"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "Кольори ÑпиÑку програваннÑ"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "Кольори"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "Включити Ñервер прокÑÑ–"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "ÐдреÑа Ñервера прокÑÑ–:"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "Порт Ñервера прокÑÑ–:"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "Тип прокÑÑ–:"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "Ðазва кориÑтувача прокÑÑ–:"
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "Пароль кориÑтувача прокÑÑ–:"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "Мережа"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
- msgstr ""
+ msgstr "Задані комбінації клавіш:"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
- msgstr ""
+ msgstr "ДіÑ:"
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
- msgstr ""
+ msgstr "<Ðе вÑтановлено>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
- msgstr ""
+ msgstr "ÐšÐ¾Ð¼Ð±Ñ–Ð½Ð°Ñ†Ñ–Ñ ÐºÐ»Ð°Ð²Ñ–Ñˆ:"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
- msgstr ""
+ msgstr "Глобальні гарÑчі клавіші"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -881,122 -910,128 +928,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
- msgstr ""
+ msgstr "ГарÑчі клавіші"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "ВерÑÑ–Ñ: "
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "ÐвторÑькі права"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "Додатки"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
- msgid "Group By ..."
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+ msgid "Group By ..."
+ msgstr "Групувати за ..."
+
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
- msgstr ""
+ msgstr "Сортувати за..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "Формат"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "Ð’ порÑдку зроÑтаннÑ"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "Ð’ порÑдку ÑпаданнÑ"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "Вибрати додаток DSP"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "Додаток"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð¿Ð¸Ñувача мітки"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "ВпиÑати ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "ВпиÑати ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "ВпиÑати APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "Вирізати ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "Вирізати ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "Вирізати APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ВерÑÑ–Ñ ID3v2"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (Рекомендовано)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ÐšÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñимволів у ID3v1 (типово Ñ” iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "ВпиÑати ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1004,91 -1039,100 +1057,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
- msgstr ""
+ msgstr "Скинути до типових"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
- msgstr ""
+ msgstr "Додатки:"
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
- msgstr ""
+ msgstr "Параметри кнопки"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
- msgstr ""
+ msgstr "Колір:"
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
- msgstr ""
+ msgstr "Колір текÑту:"
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
- msgstr ""
+ msgstr "Піктограма:"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
- msgstr ""
+ msgstr "Мітка:"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
+ msgstr "Оберіть дію"
+
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Виконавець / Ðльбом"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Ðомер треку"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "Додати до черги програваннÑ"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "Вилучити з черги програваннÑ"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "Перезавантажити метадані"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Вилучити з диÑку"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Додати колонку"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Редагувати колонку"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Вилучити колонку"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Групувати по"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Ðічого"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Виконавець/Дата/Ðльбом"
@@@ -1105,19 -1149,19 +1171,19 @@@ msgstr "Ðалаштувати %s
msgid "Default Audio Device"
msgstr "Типовий приÑтрій Ðудіо"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
- msgstr ""
+ msgstr "Ви змінили комбінації клавіш, проте не зберегли внеÑені зміни."
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
- msgstr ""
+ msgstr "Ви дійÑно впевнені що хочете продовжити без збереженнÑ?"
#: ../plugins/gtkui/progress.c:56
msgid "Adding files..."
msgstr "Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²"
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "ІніціалізаціÑ..."
@@@ -1130,103 -1174,103 +1196,113 @@@ msgid "Really close the window?
msgstr "ДійÑно закрити вікно?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[Різні значеннÑ] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "Клавіша"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "Клавіша"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "ЗначеннÑ"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "ЗапиÑую мітки..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
- msgstr ""
+ msgstr "Ðазва файлу"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "Ðазва:"
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "Ðазви полів не повинні починатиÑÑ Ð· : або _"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "Ðеможливо додати поле"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "Поле з такою назвою вже Ñ–Ñнує, введіть іншу назву."
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "Додати поле"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "Вилучити поле"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
- msgstr ""
+ msgstr "ВикориÑтаннÑ: deadbeef [опції] [--] [файл(и)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "Опції:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr ""
" --help або -h Показати цю допомогу (це повідомленнÑ) Ñ– вийти\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit Вийти з програвача\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version Показати інформацію про верÑÑ–ÑŽ Ñ– вийти\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play Почати програваннÑ\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop Зупинити програваннÑ\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause Призупинити програваннÑ\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause Ð¿ÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ Ð¿Ð°ÑƒÐ·Ð¸\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
@@@ -1234,38 -1278,40 +1310,40 @@@ msgstr "
" --play-pause Почати Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð²Ð°Ð½Ð½Ñ Ñкщо зупинено, включити паузу в "
"протилежному випадку\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next ÐаÑтупна піÑÐ½Ñ Ð² ÑпиÑку програваннÑ\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ Ð¿Ñ–ÑÐ½Ñ Ð² ÑпиÑку програваннÑ\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random Випадкова піÑÐ½Ñ Ð² ÑпиÑку програваннÑ\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue Додати файл(и) до Ñ–Ñнуючого ÑпиÑку програваннÑ\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
+ " --gui PLUGIN Вказує Ñке Ð´Ð¾Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñу викориÑтовувати, "
+ "типовим є \"GTK2\"\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT Показати форматовану назву треку до виводу\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1276,7 -1322,7 +1354,7 @@@ msgstr "
" [l]триваліÑÑ‚ÑŒ, [n]номер треку, [y]рік, [c]коментар,\n"
" [r]копірайт, [e]Ñ‡Ð°Ñ Ñ‰Ð¾ пройшов\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1285,28 -1331,24 +1363,36 @@@ msgstr "
" наприклад: --nowplaying \"%%a - %%t\" повинно показати "
"\"виконавець - назва\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " Ð´Ð»Ñ Ð±Ñ–Ð»ÑŒÑˆÐ¾Ñ— інформації дивитиÑÑ http://sourceforge.net/"
- "apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Типово"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Так"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Типово"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Так"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "ÐÑ–"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1332,7 -1374,7 +1418,7 @@@ msgstr "
"Гурт / Ðльбом Виконавець\n"
"КориÑтувацьке"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1340,7 -1382,7 +1426,7 @@@ msgstr "
"Зліва\n"
"Справа"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1350,7 -1392,7 +1436,7 @@@ msgstr "
"Трек\n"
"Ðльбом"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1358,7 -1400,7 +1444,7 @@@ msgstr "
"Ð’ порÑдку зроÑтаннÑ\n"
"Ð’ порÑдку ÑпаданнÑ"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1366,14 -1408,7 +1452,7 @@@ msgstr "
"2.3 (Рекомендовано)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "Ðе можу знайти файл pixmap: %s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1386,7 -1421,7 +1465,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1505,7 -1540,7 +1584,7 @@@ msgstr "ЯкіÑÑ‚ÑŒ передиÑкр
#: ../translation/extra.c:37
msgid "8-bit output (default is 16)"
- msgstr ""
+ msgstr "8-бітний вихід (типовим є 16)"
#. Game_Music_Emu decoder plugin
#: ../translation/extra.c:39
@@@ -1671,7 -1706,7 +1750,7 @@@ msgstr "ЧаÑтота диÑкрети
#: ../translation/extra.c:94
msgid "Quality / Algorithm"
- msgstr ""
+ msgstr "ЯкіÑÑ‚ÑŒ / Ðлгоритм"
#: ../translation/extra.c:95
msgid "Automatic Samplerate (overrides Target Samplerate)"
@@@ -1680,7 -1715,7 +1759,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1695,37 -1730,42 +1774,42 @@@ msgstr "
#: ../translation/extra.c:102
msgid "Enable surround"
+ msgstr "Увімкнути оточеннÑ"
+
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "Файл вже Ñ–Ñнує. ПерезапиÑати?"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ð²ÐµÑ€Ñ‚Ð¾Ñ€Ð°"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "Будь лаÑка, виберіть інший енкодер"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "Помилка конвертора"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "КонвертуваннÑ..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "Вибрати теку..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "Ðе можна зберегти типові параметри енкодера"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
@@@ -1733,79 -1773,79 +1817,79 @@@ msgstr "
"Перевірте типові права доÑтупу теки, Ñпробуйте вибрати іншу назву, або "
"звільніть трохи диÑкового проÑтору"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
"Типові параметри з тою Ñамою назвою вже Ñ–Ñнують. Спробуйте вибрати іншу "
"назву."
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "Помилка"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "Додати новий енкодер"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "Редагувати енкодер"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "Вилучити типові значеннÑ"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "Ð¦Ñ Ð´Ñ–Ñ Ð²Ð¸Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ вибрані типові значеннÑ. Ви впевнені?"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "Енкодери"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "Додати додаток до ланцюжка DSP"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "Ðе можу зберегти типові Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ DSP"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "Ðові типові Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ DSP"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "Редагувати типові Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ DSP"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "Типові Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ DSP"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "Тека виводу:"
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "Ðазва файла виводу:"
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1815,89 -1855,89 +1899,89 @@@ msgstr "
"Ð Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ (наприклад .mp3) буде додано автоматично.\n"
"Залишіть поле пуÑтим Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ð¾Ð²Ð¸Ñ… значень (%a - %t)."
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "Енкодер:"
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "Типові Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ DSP"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "КількіÑÑ‚ÑŒ потоків:"
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "Формат зразка виводу:"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "Зберегти формат джерела"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 біт ціле"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 біт ціле"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 біт ціле"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 біт ціле"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 біт плаваюче"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "Коли файл Ñ–Ñнує:"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "Питати"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "ПерезапиÑати"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "Редагувати типові Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐµÐ½ÐºÐ¾Ð´ÐµÑ€Ð°"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "Енкодер без назви"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "Ð Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° виводу:"
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "Ðаприклад mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "Командна Ñтрічка:"
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1907,7 -1947,7 +1991,7 @@@ msgstr "
"Приклад: lame - %o\n"
"%i Ð´Ð»Ñ Ð²Ñ…Ñ–Ð´Ð½Ð¾Ð³Ð¾ файлу, %o Ð´Ð»Ñ Ð²Ð¸Ñ…Ñ–Ð´Ð½Ð¾Ð³Ð¾ файлу, - Ð´Ð»Ñ Ð¿Ð¾Ñ‚Ð¾ÐºÐ¾Ð²Ð¸Ñ… даних"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1917,66 -1957,72 +2001,72 @@@ msgstr "
"<small>%o - назва вихідного файлу\n"
"%i - назва тимчаÑового вхідного файлу</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "Метод:"
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "Трубка"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "ТимчаÑовий файл"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>ЗапиÑувач мітки</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "Редактор типових значень DSP"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "Типові Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ DSP без назви"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Додати"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "Ðе можу знайти файл pixmap: %s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2002,29 -2048,29 +2092,29 @@@ msgstr "
#: ../plugins/shellexecui/interface.c:46
#: ../plugins/shellexecui/shellexec.glade.h:1
msgid "Custom Shell Commands"
- msgstr ""
+ msgstr "ВлаÑні команди оболонки"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
- msgstr ""
+ msgstr "Редагувати"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
- msgstr ""
+ msgstr "Закрит"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
- msgstr ""
+ msgstr "Редагувати команду"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
- msgstr ""
+ msgstr "Команда:"
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2033,74 -2079,74 +2123,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
- msgstr ""
+ msgstr "ID:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
- msgstr ""
+ msgstr "Загальні (Головне меню)"
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2108,92 -2154,92 +2198,96 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
- msgstr ""
+ msgstr "Додати команду"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
- msgstr ""
+ msgstr "Вилучити"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
- msgstr ""
+ msgstr "Ð¦Ñ Ð´Ñ–Ñ Ñпричинить Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ Ð²Ð¸Ð±Ñ€Ð°Ð½Ð¾Ñ— команди оболонки. Ви впевнені?"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
- msgstr ""
+ msgstr "ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
- msgstr ""
+ msgstr "ID має бути унікальним та не пуÑтим.\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
- msgstr ""
+ msgstr "Команда оболонки має бути не порожньою.\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
- msgstr ""
+ msgstr "Ðевірні значеннÑ"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
- msgstr ""
+ msgstr "Підтримувані аудіо-формати"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
- msgstr ""
+ msgstr "Ð’ÑÑ– файли (*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
- msgstr ""
+ msgstr "Відкрити файл(и)..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
- msgstr ""
+ msgstr "Додати файл(и) до ÑпиÑку програваннÑ..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
- msgstr ""
+ msgstr "Додати теку(-ки) до ÑпиÑку програваннÑ..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
- msgstr ""
+ msgstr "help.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
- msgstr ""
+ msgstr "Видалити файли з диÑка"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
- msgstr ""
+ msgstr "Завантажити ÑпиÑок"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
- msgstr ""
+ msgstr "Інші файли (*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
- msgstr ""
+ msgstr "Зберегти ÑпиÑок Ñк"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
- msgstr ""
+ msgstr "Файли ÑпиÑків DeaDBeeF (*.dbpl)"
#: ../plugins/gtkui/ctmapping.c:129
msgid "Content-Type"
@@@ -2216,104 -2262,113 +2310,189 @@@ msgstr "
#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
msgid "Nothing is selected."
+ msgstr "Ðічого не обрано."
+
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
++=======
+ #: ../plugins/gtkui/widgets.c:772
++>>>>>>> upstream/0.6.2
msgid "Replace with..."
- msgstr ""
+ msgstr "Замінити на..."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:599
++=======
+ #: ../plugins/gtkui/widgets.c:777
++>>>>>>> upstream/0.6.2
msgid "Insert..."
- msgstr ""
+ msgstr "Ð’Ñтавити..."
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:626
++=======
+ #: ../plugins/gtkui/widgets.c:804
++>>>>>>> upstream/0.6.2
msgid "Cut"
- msgstr ""
+ msgstr "Вирізати"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:633
++=======
+ #: ../plugins/gtkui/widgets.c:811
++>>>>>>> upstream/0.6.2
msgid "Copy"
- msgstr ""
+ msgstr "Копіювати"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:640
++=======
+ #: ../plugins/gtkui/widgets.c:818
++>>>>>>> upstream/0.6.2
msgid "Paste"
- msgstr ""
+ msgstr "Ð’Ñтавити"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
- msgid "Lock movement"
++=======
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:1249
++>>>>>>> upstream/0.6.2
+ msgid "Lock movement"
+ msgstr "Заблокувати переміщеннÑ"
+
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1356
++=======
+ #: ../plugins/gtkui/widgets.c:1534
++>>>>>>> upstream/0.6.2
msgid "Move tab left"
- msgstr ""
+ msgstr "ПереміÑтити вкладку ліворуч"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1363
++=======
+ #: ../plugins/gtkui/widgets.c:1541
++>>>>>>> upstream/0.6.2
msgid "Move tab right"
- msgstr ""
+ msgstr "ПереміÑтити вкладку праворуч"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1370
++=======
+ #: ../plugins/gtkui/widgets.c:1548
++>>>>>>> upstream/0.6.2
msgid "Remove tab"
- msgstr ""
+ msgstr "Вилучити вкладку"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1377
++=======
+ #: ../plugins/gtkui/widgets.c:1555
++>>>>>>> upstream/0.6.2
msgid "Rename tab"
- msgstr ""
+ msgstr "Перейменувати вкладку"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1438
++=======
+ #: ../plugins/gtkui/widgets.c:1616
++>>>>>>> upstream/0.6.2
msgid "Add new tab"
- msgstr ""
+ msgstr "Додати нову вкладку"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1861
++=======
+ #: ../plugins/gtkui/widgets.c:2036
++>>>>>>> upstream/0.6.2
msgid "Show Column Headers"
- msgstr ""
+ msgstr "Показати заголовки колонок"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
- msgid "Expand"
++=======
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3197
++>>>>>>> upstream/0.6.2
+ msgid "Expand"
+ msgstr "Розгорнути"
+
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3027
++=======
+ #: ../plugins/gtkui/widgets.c:3205
++>>>>>>> upstream/0.6.2
msgid "Fill"
- msgstr ""
+ msgstr "Заповнити"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
+ msgstr "Ðалаштувати кнопку"
+
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
msgstr ""
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
- msgstr ""
+ msgstr "Редагувати ÑпиÑок"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
- msgstr ""
+ msgstr "Перейменувати ÑпиÑок"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
- msgstr ""
+ msgstr "Вилучити ÑпиÑок"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
- msgstr ""
+ msgstr "Додати новий ÑпиÑок"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
- msgstr ""
+ msgstr "Ðазва"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/vi.po
index 1bc950a,dcba92b..550bfb2
--- a/po/vi.po
+++ b/po/vi.po
@@@ -3,18 -3,20 +3,26 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
- # ppanhh <vietnamesel10n at gmail.com>, 2013
- # Duy Hung Tran <nguyentieuhau at gmail.com>, 2010
- # ppanhh <vietnamesel10n at gmail.com>, 2013
- # ppanhh <vietnamesel10n at gmail.com>, 2013
- # Duy Hung Tran <nguyentieuhau at gmail.com>, 2010
+ # Anh Phan <vietnamesel10n at gmail.com>, 2013
+ # Anh Phan <vietnamesel10n at gmail.com>, 2013-2014
+ # TRAN Duy Hung <nguyentieuhau at gmail.com>, 2010
+ # Anh Phan <vietnamesel10n at gmail.com>, 2013
+ # Anh Phan <vietnamesel10n at gmail.com>, 2013
+ # TRAN Duy Hung <nguyentieuhau at gmail.com>, 2010
+ # TRAN Duy Hung <nguyentieuhau at gmail.com>, 2010
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:49+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/deadbeef-"
"player/language/vi/)\n"
"Language: vi\n"
@@@ -23,17 -25,17 +31,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "Vá» DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s Nháºt ký thay đổi"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF Dịch giả"
@@@ -90,788 -92,818 +98,830 @@@ msgstr "Preamp Vá» 0
msgid "Zero Bands"
msgstr "Bands Vá» 0"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "Presets"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 ngà y %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d ngà y %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "Dừng phát | %d bà i | Tất cả %s"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "Mono"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "Stereo"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "Tạm dừng | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d bà i | Tất cả %s"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "Playlist Má»›i"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "Playlist Má»›i (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "Danh sách phát dạng tab"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "Danh sách phát"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "Ngăn đôi (trên và dưới cùng)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "Ngăn đôi (trái và phải)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "Danh sách phát dạng tab"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "Thuá»™c tÃnh lá»±a chá»n"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "Hiển thị album nghệ thuáºt"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "Phạm vi"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "Phổ tần"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "Nút"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr "Thanh trượt"
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr "Äiá»u khiển phát lại"
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr "Thanh âm lượng"
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr "Giá»ng Ä‘iện tá»"
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "Lá»—i trong khi Ä‘á»c táºp tin trợ giúp"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "Không thể Ä‘á»c táºp tin trợ giúp"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
+ "ChÆ°Æ¡ng trình hiện Ä‘ang chạy ở chế Ä‘á»™ ná»n. Nếu bạn thoát bây giá», thì tác vụ "
+ "nà y sẽ bị hủy bá» hoặc gián Ä‘oạn. Äiá»u nà y có thể dẫn tá»›i việc mất mát dữ "
+ "liệu."
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "Bạn vẫn muốn thoát?"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "Cảnh báo"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "_Táºp tin"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "_Mở táºp tin"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "Thêm táºp tin"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "Thêm thư mục"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "Thêm vị trÃ"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "Tạo playlist mới"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "Nạp playlist"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "LÆ°u playlist"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "T_hoát"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "_Sá»a"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "_Xóa"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "Chá»n tất cả"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "Bá» chá»n tất cả"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "Äảo lá»±a chá»n"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "Lá»±a chá»n"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "Xóa"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "Cắt"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "Tì_m"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "Sắp xếp theo"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "Tiêu Ä‘á»"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "Thứ tự bà i"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "Album"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "Nghệ sĩ"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "Ngà y"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "Ngẫu nhiên"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "Tùy chá»n"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "Tùy chỉnh"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "_Hiển thị"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "Thanh trạng thái"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "Equalizer"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "Chế độ thiết kế"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "Phát _lại"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "Thứ tự"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "Theo thứ tự"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "Bà i hát ngẫu nhiên"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "Album ngẫu nhiên"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "Lặp lại"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "Lặp lại tất cả"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "Lặp lại chỉ một đối tượng"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "Không lặp lại"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "Trượt theo quá trình phát lại"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "Con trỠđi theo quá trình phát lại"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "Dừng sau khi kết thúc bà i hiện tại"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr "Dừng lại sau bà i nà y"
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr "Dừng lại sau album nà y"
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "Nhảy đến bà i hiện tại"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "T_rợ giúp"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_Nháºt ký thay đổi"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "Thôn_g tin"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "_Dịch giả"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "Tìm kiếm"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "Dừng"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "Phát"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "Tạm dừng"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "TrÆ°á»›c"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "Sau"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "Phát Ngẫu Nhiên"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "Thông tin"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "Thoát"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "Trợ giúp"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "Thông Tin Bà i Nhạc"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "Äịa Ä‘iểm:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "Thiết láºp"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "Ã_p dụng"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "Äó_ng"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "Metadata"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "Thuá»™c tÃnh"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "Tiêu Ä‘á»:"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "Nháºp tiêu Ä‘á» cá»™t má»›i tại đây"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "Loại:"
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "Item Index"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "Äang phát"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "Bìa Album"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "Nghệ sĩ - Album"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "Thá»i lượng"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "Thứ Tự Bà i Hát"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "Nhóm / Nghệ sĩ"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "Äịnh dạng:"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "Canh chỉnh:"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "Trái"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "Phải"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "_Hủy"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "Äồng _ý"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "Plugin đầu ra:"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "Thiết bị đầu ra:"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "Luôn luôn chuyển đổi âm thanh 8 bit sang 16 bit"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
- msgstr ""
+ msgstr "Luôn chuyển đổi audio dạng 16 bit sang 24 bit"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "Âm thanh"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "Chế độ Replaygain:"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "Tắt"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "BÃ i"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "Tỉ lệ cao điểm Replaygain"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "Khuếch đại trước của Replaygain:"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "Khuếch đại trước toà n cục:"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr "Thêm táºp tin từ dòng lệnh (hay bá»™ quản lý táºp tin) và o playlist nà y:"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "Phục hội lại phiên là m việc cuối khi vừa khởi động"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "Không thêm từ các táºp tin lÆ°u trữ khi thêm thÆ° mục"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "Tự động-cà i đặt lại \"Dừng lại sau đối tượng hiện tại\""
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "Phát lạ_i"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "Cấu hình"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP Chain Preset"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "_Nạp"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "Thu nhỠxuống khay hệ thống"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "Ẩn biểu tượng khay hệ thống"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr ""
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr ""
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "Ẩn đối tượng \"Xóa khá»i ổ Ä‘Ä©a\" từ menu ngữ cảnh"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr ""
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr ""
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "Ghi đè"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "Mặt trước"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "Mặt sau"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "Mà u thanh trượt/thanh âm lượng"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "Giữa"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "Sáng"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "Tối"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr ""
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "Văn bản"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr ""
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "Dòng chẵn"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "Dòng lẻ"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "Dòng đã chá»n"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "Văn bản đã chá»n"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "Trá» chuá»™t"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "MÃ u playlist"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr ""
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr ""
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr ""
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr ""
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr ""
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -879,122 -911,128 +929,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr ""
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr ""
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr ""
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr ""
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL:"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr ""
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr ""
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr ""
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr ""
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr ""
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr ""
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr ""
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr ""
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr ""
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr ""
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr ""
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr ""
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1002,91 -1040,100 +1058,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "Nghệ sĩ / Album"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "Bà i Số"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "Xóa khá»i Ä‘Ä©a"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "Thêm cột"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "Sá»a cá»™t"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "Xóa cột"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "Nhóm bởi"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "Không"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "Nghệ sĩ/Ngà y/Album"
@@@ -1103,11 -1150,11 +1172,11 @@@ msgstr "
msgid "Default Audio Device"
msgstr "Thiết bị Âm thanh Mặc định"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1115,7 -1162,7 +1184,7 @@@
msgid "Adding files..."
msgstr "Thêm táºp tin..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "Äang khởi tạo..."
@@@ -1128,139 -1175,139 +1197,149 @@@ msgid "Really close the window?
msgstr "Bạn tháºt sá»± muốn đóng cá»a sổ nà y?"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "PhÃm tắt"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "PhÃm tắt"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "Giá trị"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr ""
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr ""
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr ""
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr ""
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr ""
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr ""
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr ""
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr ""
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr ""
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr ""
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr ""
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr ""
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr ""
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr ""
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr ""
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr ""
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr ""
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1268,33 -1315,31 +1347,43 @@@
" copy[r]ight, [e]lapsed\n"
msgstr ""
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
"- title\"\n"
msgstr ""
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "Mặc định"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "Có"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "Mặc định"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "Có"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "Không"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1309,7 -1354,7 +1398,7 @@@
"Custom"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1317,7 -1362,7 +1406,7 @@@ msgstr "
"Trái\n"
"Phải"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1327,26 -1372,19 +1416,19 @@@ msgstr "
"BÃ i\n"
"Album"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
msgstr ""
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
msgstr ""
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr ""
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1356,7 -1394,7 +1438,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1649,7 -1687,7 +1731,7 @@@ msgstr "
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
@@@ -1666,111 -1704,116 +1748,116 @@@ msgstr "
msgid "Enable surround"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr ""
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr ""
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr ""
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr ""
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr ""
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr ""
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr ""
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr ""
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr ""
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr ""
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr ""
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr ""
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr ""
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr ""
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr ""
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr ""
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr ""
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr ""
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr ""
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr ""
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1778,89 -1821,89 +1865,89 @@@
"Leave the field empty for default (%a - %t)."
msgstr ""
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr ""
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr ""
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr ""
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr ""
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr ""
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr ""
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr ""
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr ""
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr ""
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr ""
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr ""
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr ""
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr ""
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr ""
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr ""
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1868,7 -1911,7 +1955,7 @@@
"%i for input file, %o for output file, - for stdin"
msgstr ""
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1876,66 -1919,72 +1963,72 @@@
"%i - temporary input file name</small>"
msgstr ""
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr ""
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr ""
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr ""
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr ""
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr ""
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr ""
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr ""
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr ""
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr ""
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr ""
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr ""
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "Thêm"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr ""
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1963,27 -2012,27 +2056,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr ""
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr ""
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr ""
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr ""
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -1992,74 -2041,74 +2085,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr ""
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2067,90 -2116,90 +2160,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2177,102 -2226,111 +2274,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
diff --combined po/zh_CN.po
index baa5952,f4caf41..516192d
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -3,14 -3,14 +3,20 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
- # Wylmer Wang <wantinghard at gmail.com>, 2013
+ # Wylmer Wang <wantinghard at gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/deadbeef-"
"player/language/zh_CN/)\n"
"Language: zh_CN\n"
@@@ -19,17 -19,17 +25,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "关于 DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s 更新记录"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF 翻译者"
@@@ -86,913 -86,949 +92,961 @@@ msgstr "清零å‰ç½®æ”¾å¤§
msgid "Zero Bands"
msgstr "清零频段"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "预设置"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 天 %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d 天 %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "å·²åœæ¢ | 音轨数 %d | æ’放总时长 %s"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "å•å£°é“"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "å•å£°é“"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "立体声"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "å·²æš‚åœ | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | 音轨数 %d | æ’放总时长 %s"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "æ–°æ’放列表"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "æ–°æ’放列表(%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "æ ‡ç¾é¡µå¼æ’放列表"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "æ’放列表"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "分割线(顶部和底部)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "分割线(左侧和å³ä¾§)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "æ’æ”¾åˆ—è¡¨æ ‡ç¾é¡µ"
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "所选项目属性"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "专辑å°é¢æ˜¾ç¤º"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "范围"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "频谱"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
msgstr "水平框"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
msgstr "垂直框"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "按钮"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr "定ä½æ¡"
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr "æ’放控制"
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr "音é‡æ¡"
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr "芯片åˆæˆè¯éŸ³"
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "读å–帮助文件时出错"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "åŠ å…¥å¸®åŠ©æ–‡ä»¶å¤±è´¥"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
"æ’放器æ£åœ¨æ‰§è¡ŒåŽå°ä»»åŠ¡ã€‚如果您现在退出，任务会å–消或ä¸æ–；这å¯èƒ½é€ æˆæ•°æ®æŸ"
"失。"
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "您ä¾ç„¶è¦é€€å‡ºå—？"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "è¦å‘Š"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "文件(_F)"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "打开文件(_O)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "æ·»åŠ æ–‡ä»¶"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "æ·»åŠ æ–‡ä»¶å¤¹"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "æ·»åŠ ä½ç½®"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "æ–°æ’放列表"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "åŠ è½½æ’放列表"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "ä¿å˜æ’放列表"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "退出(_Q)"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "编辑(_E)"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "清除(_C)"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "选择所有"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "去选所有"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "å转选择"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "选择"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "移除"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "剪切"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "查找(_F)"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "排åºä¾æ®"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "æ ‡é¢˜"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "音轨å·"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "专辑"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "艺人"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "日期"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "éšæœº"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "自定义"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "å好设置"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "查看(_V)"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "状æ€æ "
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "å‡è¡¡å™¨"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
msgstr "设计模å¼"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "æ’放(_P)"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "顺åº"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "线性"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "打乱音轨"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "打乱专辑"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "循环"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "全部循环"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "å•æ›²å¾ªçŽ¯"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "ä¸å¾ªçŽ¯"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "éšæ’放滚动列表"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "å…‰æ ‡å®šä½åœ¨æ’放的曲目"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "当å‰æ›²ç›®åŽåœæ¢"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr "当å‰ä¸“辑åŽåœæ¢"
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "跳到当å‰éŸ³è½¨"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "帮助(_H)"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "更新记录(_C)"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "关于(_A)"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "翻译者(_T)"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "æœç´¢"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "åœæ¢"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "æ’放"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "æš‚åœ"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "上一曲"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "下一曲"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "éšæœºæ’放"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "关于"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "退出"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "帮助"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "音轨属性"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "ä½ç½®ï¼š"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "设置"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "应用(_A)"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "å…³é—(_C)"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "元数æ®"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "属性"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "æ ‡é¢˜ï¼š"
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "在æ¤è¾“å…¥æ–°çš„åˆ—æ ‡é¢˜"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "类型："
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "项目索引"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "æ£åœ¨æ’放"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "专辑å°é¢"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "艺人 - 专辑"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "时长"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "音轨å·"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "ä¹é˜Ÿ / 专辑艺人"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "æ ¼å¼ï¼š"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "对é½ï¼š"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "å·¦"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "å³"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "å–消(_C)"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "确定(_O)"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "输出æ’件："
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "输出设备："
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "总是将 8 ä½éŸ³é¢‘转æ¢ä¸º 16 ä½"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr "总是将 16 ä½éŸ³é¢‘转æ¢ä¸º 24 ä½"
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "声音"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "回放增益方å¼ï¼š"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "ç¦ç”¨"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "音轨"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "回放增益峰值å‡è¡¡"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "回放预增益："
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "全局预增益："
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr "通过命令行(或文件管ç†å™¨)å‘æ¤æ’æ”¾åˆ—è¡¨æ·»åŠ æ–‡ä»¶ï¼š"
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "å¯åŠ¨æ—¶æ¢å¤ä¸Šä¸€æ¬¡ä¼šè¯"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "åœ¨æ·»åŠ æ–‡ä»¶å¤¹æ—¶æŽ’é™¤å½’æ¡£"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "自动å¤ä½â€œå½“å‰æ›²ç›®åŽåœæ¢â€"
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "回放"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "é…ç½®"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP 链预设置"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "åŠ è½½(_L)"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP(æ•°å—ä¿¡å·å¤„ç†)"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "点击关é—时最å°åŒ–到托盘"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "éšè—ç³»ç»Ÿæ‰˜ç›˜å›¾æ ‡"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr "å¯ç”¨æ—¥æ–‡ SHIFT-JIS ç¼–ç 检测和é‡æ–°ç¼–ç "
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "å¯ç”¨ä¿„è¯ CP1251 å—符集检测和é‡æ–°ç¼–ç "
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "å¯ç”¨ä¸æ–‡ Chinese CP936 ç¼–ç 检测和é‡æ–°ç¼–ç "
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "ç•Œé¢åˆ·æ–°é¢‘率(æ¯ç§’的次数)："
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "æ’æ”¾æ—¶çš„æ ‡é¢˜æ 文本："
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "åœæ¢æ—¶çš„æ ‡é¢˜æ 文本："
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "图形用户界é¢æ’件(更改åŽéœ€é‡å¯ç¨‹åº)："
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
- msgstr ""
+ msgstr "æ’放器"
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
- msgstr ""
+ msgstr "ç”¨é¼ æ ‡ä¸é”®å…³é—æ’放列表"
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
- msgstr ""
+ msgstr "用粗体显示æ£åœ¨æ’放的音轨"
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "éšè—“从ç£ç›˜åˆ 除â€å³é”®èœå•é¡¹"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr "éšè—“从ç£ç›˜ç§»é™¤â€å³é”®èœå•é¡¹"
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "åœ¨æ·»åŠ å•ä¸ªæ–‡ä»¶å¤¹æ—¶è‡ªåŠ¨å‘½åæ’放列表"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
- msgstr ""
+ msgstr "自动调整列宽以适应窗å£"
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "用户界é¢/æ‚项"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "覆盖"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "å‰æ™¯è‰²"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "背景色"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "æœç´¢æ¡/音é‡æ¡é¢œè‰²"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "ä¸"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "å³"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "æš—"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "基础"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "文本"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "æ ‡ç¾æ¡é¢œè‰²"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "覆盖(ä¸åŒäºŽ GTK æ ‘çŠ¶è§†å›¾é£Žæ ¼ï¼Œä½†æ¸²æŸ“æ›´å¿«)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "å¶æ•°è¡Œ"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "奇数行"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "选择的行"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "选择的文本"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "å…‰æ ‡"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "æ’放列表颜色"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "颜色"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "å¯ç”¨ä»£ç†æœåŠ¡å™¨"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "代ç†æœåŠ¡å™¨åœ°å€ï¼š"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "代ç†æœåŠ¡å™¨ç«¯å£ï¼š"
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "代ç†ç±»åž‹ï¼š"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "代ç†ç”¨æˆ·å："
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "代ç†å¯†ç ："
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "HTTP 用户代ç†ï¼š"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr "编辑 内容-类型 æ˜ å°„"
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "网络"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr "已分é…çš„å¿«æ·é”®ï¼š"
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr "æ“作："
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
msgstr "<未设置>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr "按键组åˆï¼š"
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
msgstr "全局快æ·é”®"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
"The changes will NOT be saved\n"
"if you don't press Apply."
msgstr ""
+ "使用“应用â€æŒ‰é’®ä¿å˜æ‚¨çš„更改，\n"
+ "或使用“æ¢å¤â€æŒ‰é’®æ’¤æ¶ˆæ›´æ”¹ã€‚\n"
+ "在您按“应用â€ä¹‹å‰ï¼Œæ›´æ”¹ä¸ä¼šä¿å˜ã€‚"
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
- msgstr ""
+ msgstr "默认(_D)"
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
msgstr "å¿«æ·é”®"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "版本："
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "版æƒ"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "æ’件"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "URL："
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
+ msgstr "è‡ªå®šä¹‰æ ‡é¢˜"
+
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
msgid "Group By ..."
msgstr "分组ä¾æ®..."
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
msgstr "排åºä¾æ®..."
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "æ ¼å¼"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "å‡åº"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "é™åº"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "选择 DSP æ’件"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "æ’件"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "æ ‡ç¾ç¼–辑器设置"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "写 ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "写 ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "写 APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "清除 ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "清除 ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "清除 APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 版本"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (推è)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 å—符编ç (默认为 iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "写 ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
msgstr "内容-类型 æ˜ å°„"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1003,91 -1039,103 +1057,107 @@@ msgstr "
"文件的内容类型会是“audio/x-mpegâ€ï¼Œå®ƒéœ€è¦é€šè¿‡ DeaDBeeF 自己的“stdmpgâ€æ’件"
"或“ffmpegâ€æ’件解ç 。"
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr "å¤ä½ä¸ºé»˜è®¤å€¼"
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr "内容-类型："
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr "æ’件："
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr "按钮属性"
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr "颜色："
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr "文本颜色："
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr "å›¾æ ‡ï¼š"
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr "æ ‡ç¾ï¼š"
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr "选择æ“作"
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+ "这一对è¯æ¡†å¯ä»¥è‡ªå®šä¹‰ä»»ä½•éŸ³è½¨çš„æ ‡é¢˜ã€‚è¿™å¯¹ç”µå°æœ€æœ‰ç”¨ã€‚â€œæ·»åŠ ä½ç½®â€å¯¹è¯æ¡†ä¹Ÿæœ‰ä¸€ä¸ª"
+ "选项æ¥è®¾ç½®è‡ªå®šä¹‰æ ‡é¢˜ã€‚æ ‡é¢˜å°†å‡ºçŽ°åœ¨æ˜¾ç¤ºâ€œè‰ºäººâ€å…ƒæ•°æ®çš„列ä¸ã€‚它会显示为“[自定"
+ "义] 艺人â€(如果有“艺人â€å—段)，或“自定义â€ã€‚"
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "艺人 / 专辑"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "音轨å·"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "æ·»åŠ åˆ°æ’放列表"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr "æ·»åŠ åˆ°æ’放队列"
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
msgstr "从æ’放队列ä¸ç§»é™¤"
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
msgstr "é‡æ–°è½½å…¥å…ƒæ•°æ®"
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "从ç£ç›˜ä¸åˆ 除"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr "从ç£ç›˜ä¸ç§»é™¤"
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "æ·»åŠ åˆ—"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "编辑列"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "移除列"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
- msgstr ""
+ msgstr "滚动时固顶组"
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "分组ä¾æ®"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "æ— "
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "艺人/日期/专辑"
@@@ -1104,19 -1152,19 +1174,19 @@@ msgstr "é…ç½® %s
msgid "Default Audio Device"
msgstr "默认音频设备"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
- msgstr ""
+ msgstr "您修改了çƒé”®è®¾ç½®ï¼Œä½†æ²¡æœ‰ä¿å˜æ›´æ”¹ã€‚"
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
- msgstr ""
+ msgstr "您确定è¦ç»§ç»è€Œä¸ä¿å˜å—？"
#: ../plugins/gtkui/progress.c:56
msgid "Adding files..."
msgstr "æ£åœ¨æ·»åŠ 文件..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "æ£åœ¨åˆå§‹åŒ–..."
@@@ -1129,139 -1177,139 +1199,149 @@@ msgid "Really close the window?
msgstr "真的关é—该窗å£å—？"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[多个值] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "é”®"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "é”®"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "值"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
msgstr "[多个值] "
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "æ£åœ¨å†™å…¥æ ‡ç¾..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
msgstr "å—段å"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "å称："
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "å—段å称ä¸èƒ½ä»¥ : 或 _ 开头"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "æ— æ³•æ·»åŠ å—段"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "åŒåçš„å—段已ç»å˜åœ¨ï¼Œè¯·å°è¯•å…¶ä»–å称。"
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "æ·»åŠ å—段"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "移除å—段"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
msgstr "用法：deadbeef [选项] [--] [文件]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "选项：\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help 或 -h 打å°å¸®åŠ©(è¿™æ¡æ¶ˆæ¯)并退出\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit 退出æ’放器\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version 打å°ç‰ˆæœ¬ä¿¡æ¯å¹¶é€€å‡º\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play 开始æ’放\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop åœæ¢æ’放\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause æš‚åœæ’放\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause 切æ¢æš‚åœçŠ¶æ€\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr " --play-pause è‹¥åœæ¢åˆ™å¼€å§‹æ’放，å¦åˆ™åˆ‡æ¢æš‚åœçŠ¶æ€\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next æ’放列表ä¸çš„下一首æŒæ›²\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev æ’放列表ä¸çš„上一首æŒæ›²\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random æ’放列表ä¸çš„任一首æŒæ›²\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue å‘现有的æ’放列表ä¸è¿½åŠ 文件\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr " --gui PLUGIN 指定è¦ä½¿ç”¨çš„用户界é¢æ’件，默认为“GTK2â€\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT å‘æ ‡å‡†è¾“å‡ºæ‰“å°æ ¼å¼åŒ–的音轨å称\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1272,7 -1320,7 +1352,7 @@@ msgstr "
" [l]时长, [n]音轨å·, [y]年代, [c]注释,\n"
" [r]版æƒ, [e]å·²æ’放时间\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1280,28 -1328,24 +1360,36 @@@
msgstr ""
" 例：--nowplaying \"%%a - %%t\" 将打å°â€œè‰ºäºº - æ ‡é¢˜â€\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " 更多信æ¯è¯·å‚阅 http://sourceforge.net/apps/mediawiki/"
- "deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "默认"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "是"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "默认"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "是"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "å¦"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1327,7 -1371,7 +1415,7 @@@ msgstr "
"ä¹é˜Ÿ / 专辑艺人\n"
"自定义"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1335,7 -1379,7 +1423,7 @@@ msgstr "
"å·¦\n"
"å³"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1345,7 -1389,7 +1433,7 @@@ msgstr "
"音轨\n"
"专辑"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1353,7 -1397,7 +1441,7 @@@ msgstr "
"å‡åº\n"
"é™åº"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1361,14 -1405,7 +1449,7 @@@ msgstr "
"2.3 (推è)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "找ä¸åˆ°ä½å›¾æ–‡ä»¶ï¼š%s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1380,8 -1417,8 +1461,8 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
- msgstr "æ·»åŠ éŸ³é¢‘ CD"
+ msgid "Add Audio CD"
+ msgstr ""
#: ../translation/extra.c:4
msgid "Lookup on Last.fm"
@@@ -1673,8 -1710,8 +1754,8 @@@ msgstr "è‡ªåŠ¨é‡‡æ ·çŽ‡(æ›¿ä»£ç›®æ ‡é‡‡
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
- msgstr "é…置自定义的 shell 命令"
+ msgid "Configure Custom Shell Commands"
+ msgstr ""
#. mpgmad
#: ../translation/extra.c:99
@@@ -1690,111 -1727,116 +1771,116 @@@ msgstr "优先使用 Ken 模拟器而é
msgid "Enable surround"
msgstr "å¯ç”¨çŽ¯ç»•æ•ˆæžœ"
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
+ msgstr "[内建] %s"
+
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "文件已å˜åœ¨ã€‚覆盖å—？"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "转æ¢å™¨è¦å‘Š"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "请选择编ç 器"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "转æ¢å™¨é”™è¯¯"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "æ£åœ¨è½¬æ¢..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "选择文件夹..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "ä¿å˜ç¼–ç 器预设置失败"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr "请检查预设置文件夹æƒé™ï¼Œé€‰æ‹©å…¶ä»–æ ‡é¢˜æˆ–æ¸…ç†å‡ºä¸€äº›ç£ç›˜ç©ºé—´"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "åŒå的预设置已ç»å˜åœ¨ã€‚请å¦é€‰ä¸€ä¸ªæ ‡é¢˜ã€‚"
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "错误"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "æ·»åŠ æ–°ç¼–ç 器"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "编辑编ç 器"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "移除预设置"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "æ¤æ“ä½œå°†åˆ é™¤æ‰€é€‰çš„é¢„è®¾ç½®ã€‚æ‚¨ç¡®å®šå—？"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "ç¼–ç 器"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "å‘ DSP é“¾ä¸Šæ·»åŠ æ’件"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "ä¿å˜ DSP 预设置失败"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "新建 DSP 预设置"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "编辑 DSP 预设置"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP 预设置"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "输出文件夹："
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
msgstr "写入æºéŸ³è½¨æ–‡ä»¶å¤¹"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
msgstr "ä¿æŒæ–‡ä»¶å¤¹ç»“æž„"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "输出文件å："
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1804,89 -1846,89 +1890,89 @@@ msgstr "
"扩展å(如 .mp3)ä¼šè‡ªåŠ¨è¿½åŠ ã€‚\n"
"ä¸å¡«åˆ™ä½¿ç”¨é»˜è®¤(%a - %t)。"
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "ç¼–ç 器："
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP 预设置："
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "线程数："
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "è¾“å‡ºé‡‡æ ·æ ¼å¼ï¼š"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "ä¿æŒæºæ ¼å¼"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 ä½æœ‰ç¬¦å·æ•´åž‹"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 ä½æœ‰ç¬¦å·æ•´åž‹"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 ä½æœ‰ç¬¦å·æ•´åž‹"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 ä½æœ‰ç¬¦å·æ•´åž‹"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 ä½æµ®ç‚¹åž‹"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "若文件å˜åœ¨ï¼š"
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "æ示"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "覆盖"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "编辑编ç 器预设置"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "æ— æ ‡é¢˜ç¼–ç 器"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "输出文件扩展å："
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "如 mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "命令行："
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1896,7 -1938,7 +1982,7 @@@ msgstr "
"例如：lame - %o\n"
"%i 为输入文件，%o 为输出文件，- ä¸ºæ ‡å‡†è¾“å…¥"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1906,66 -1948,72 +1992,72 @@@ msgstr "
"<small>%o - 输出文件å\n"
"%i - 临时输入文件å</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "方法："
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "管é“"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "临时文件"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>æ ‡ç¾ç¼–辑器</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "DSP 预设置编辑器"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "æ— æ ‡é¢˜çš„ DSP 预设置"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "æ·»åŠ "
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "找ä¸åˆ°ä½å›¾æ–‡ä»¶ï¼š%s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -2003,27 -2051,27 +2095,27 @@@ msgstr "
msgid "Custom Shell Commands"
msgstr "自定义 shell 命令"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
msgstr "编辑"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
msgstr "å…³é—"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
msgstr "编辑命令"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
msgstr "命令："
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2034,147 -2082,149 +2126,153 @@@ msgstr "
"ä»»æ„ shell 命令。命令将在主应用程åºå¯åŠ¨çš„ shell 环境ä¸æ‰§è¡Œã€‚å¯ä»¥ä½¿ç”¨æ ‡é¢˜æ ¼å¼"
"化代ç 。例如：xdg-open %D"
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
msgstr "æ ‡è¯†ï¼š"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr "一个åå—，形å¼ä¸é™ï¼Œå¦‚“我的 shell 命令â€"
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr "å‘½ä»¤æ ‡è¯†ï¼Œé€šå¸¸åº”ç®€çŸï¼Œå¦‚“youtube_openâ€ã€‚æ¤æ ‡è¯†åº”唯一。"
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr "å•æ¡éŸ³è½¨"
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr "作用于å•æ¡éŸ³è½¨ã€‚"
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr "多æ¡éŸ³è½¨ã€‚"
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr "作用于多æ¡éŸ³è½¨ã€‚"
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr "本地"
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr "作用于本地文件。"
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr "远程"
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr "作用于远程文件(如 http:// æµ)"
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
- msgstr ""
+ msgstr "常规(主èœå•)"
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr "项目应显示在主èœå•ä¸"
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
"contains the menu path like this: \"File/My Command\", where File is the "
"menu name in the English version.</small>"
msgstr ""
+ "<small>如果您想å‘主èœå•æ·»åŠ 命令，请确ä¿æ ‡é¢˜ä¸åŒ…å«â€œFile/My Commandâ€è¿™æ ·çš„èœå•"
+ "路径，例åä¸ File 是英文的èœå•å。</small>"
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr "æ·»åŠ å‘½ä»¤"
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr "åˆ é™¤"
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr "æ¤æ“ä½œå°†åˆ é™¤æ‰€é€‰çš„ shell 命令。您确定å—？"
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr "确认移除"
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr "æ ‡è¯†ä¸èƒ½ä¸ºç©ºï¼Œä¸”必须唯一。\n"
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr "æ ‡é¢˜ä¸èƒ½ä¸ºç©ºã€‚\n"
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr "shell 命令ä¸èƒ½ä¸ºç©ºã€‚\n"
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr "æ— æ•ˆçš„å€¼"
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr "支æŒçš„å£°éŸ³æ ¼å¼"
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr "所有文件;(*)"
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr "打开文件;..."
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr "å‘æ’æ”¾åˆ—è¡¨æ·»åŠ æ–‡ä»¶;..."
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr "å‘æ’æ”¾åˆ—è¡¨æ·»åŠ æ–‡ä»¶å¤¹;..."
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr "è·Ÿéšç¬¦å·é“¾æŽ¥"
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr "帮助.txt"
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr "从ç£ç›˜ä¸åˆ 除文件"
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
@@@ -2182,19 -2232,19 +2280,19 @@@ msgstr "
"文件将消失。继ç»å—？\n"
"(å¯ä»¥åœ¨ GTKUI æ’件设置ä¸å…³æŽ‰è¿™ä¸ªå¯¹è¯æ¡†)"
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr "åŠ è½½æ’放列表"
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr "其他文件;(*)"
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr "æ’放列表å¦å˜ä¸º"
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr "DeaDBeeF æ’放列表文件(*.dbpl)"
@@@ -2227,102 -2277,111 +2325,191 @@@ msgstr "
msgid "Nothing is selected."
msgstr "没有选择项目。"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr "替æ¢ä¸º..."
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr "æ’å…¥..."
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr "剪切"
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr "å¤åˆ¶"
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr "粘贴"
+
+#: ../plugins/gtkui/widgets.c:764
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr "“%sâ€éƒ¨ä»¶ä¸å¯ç”¨"
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr "替æ¢ä¸º..."
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr "æ’å…¥..."
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr "剪切"
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr "å¤åˆ¶"
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr "粘贴"
+
+ #: ../plugins/gtkui/widgets.c:942
++>>>>>>> upstream/0.6.2
msgid "Multiple widgets of this type are not supported"
- msgstr ""
+ msgstr "ä¸æ”¯æŒæ¤ç±»éƒ¨ä»¶çš„多个实例"
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr "é”定移动"
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr "æ ‡ç¾å·¦ç§»"
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr "æ ‡ç¾å³ç§»"
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr "ç§»é™¤æ ‡ç¾"
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr "é‡å‘½åæ ‡ç¾"
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr "æ·»åŠ æ–°æ ‡ç¾"
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr "æ˜¾ç¤ºåˆ—æ ‡é¢˜"
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr "å‘框ä¸å¢žåŠ 1 项"
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr "从框ä¸å‡å°‘ 1 项"
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr "å¹³å‡"
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr "扩展"
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr "å¡«å……"
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr "é”定移动"
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr "æ ‡ç¾å·¦ç§»"
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr "æ ‡ç¾å³ç§»"
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr "ç§»é™¤æ ‡ç¾"
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr "é‡å‘½åæ ‡ç¾"
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr "æ·»åŠ æ–°æ ‡ç¾"
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr "æ˜¾ç¤ºåˆ—æ ‡é¢˜"
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr "å‘框ä¸å¢žåŠ 1 项"
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr "从框ä¸å‡å°‘ 1 项"
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr "å¹³å‡"
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr "扩展"
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr "å¡«å……"
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr "é…置按钮"
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr "è¯éŸ³ï¼š"
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
- msgstr ""
+ msgstr "编辑æ’放列表"
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
- msgstr ""
+ msgstr "é‡å‘½åæ’放列表"
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
- msgstr ""
+ msgstr "移除æ’放列表"
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
- msgstr ""
+ msgstr "æ·»åŠ æ–°æ’放列表"
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
- msgstr ""
+ msgstr "å称"
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
++<<<<<<< HEAD
+msgstr ""
++=======
+ msgstr "æ’放列表æµè§ˆå™¨"
++>>>>>>> upstream/0.6.2
diff --combined po/zh_TW.po
index 09e1314,60d3bf3..4e8f99d
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@@ -3,17 -3,17 +3,23 @@@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
- # brli7848 <rainman59118 at gmail.com>, 2013
- # brli7848 <rainman59118 at gmail.com>, 2013
+ # BrLi <rainman59118 at gmail.com>, 2013
+ # BrLi <rainman59118 at gmail.com>, 2013
# PCMan <pcman.tw at gmail.com>, 2010
# PCMan <pcman.tw at gmail.com>, 2010
msgid ""
msgstr ""
"Project-Id-Version: DeaDBeeF Player\n"
"Report-Msgid-Bugs-To: \n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2013-11-24 19:10+0100\n"
+"PO-Revision-Date: 2013-11-20 09:50+0000\n"
+"Last-Translator: waker <wakeroid at gmail.com>\n"
++=======
+ "POT-Creation-Date: 2014-08-05 19:54+0200\n"
+ "PO-Revision-Date: 2014-07-31 18:10+0000\n"
+ "Last-Translator: Alexey Yakovenko <wakeroid at gmail.com>\n"
++>>>>>>> upstream/0.6.2
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
"deadbeef-player/language/zh_TW/)\n"
"Language: zh_TW\n"
@@@ -22,17 -22,17 +28,17 @@@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
- #: ../plugins/gtkui/callbacks.c:338
+ #: ../plugins/gtkui/callbacks.c:353
#, c-format
msgid "About DeaDBeeF %s"
msgstr "關於 DeaDBeeF %s"
- #: ../plugins/gtkui/callbacks.c:351
+ #: ../plugins/gtkui/callbacks.c:366
#, c-format
msgid "DeaDBeeF %s ChangeLog"
msgstr "DeaDBeeF %s ChangeLog"
- #: ../plugins/gtkui/callbacks.c:675
+ #: ../plugins/gtkui/callbacks.c:626
#, c-format
msgid "DeaDBeeF Translators"
msgstr "DeaDBeeF ç¿»è¯è€…"
@@@ -89,789 -89,816 +95,828 @@@ msgstr "å‰ç´šæ”¾å¤§å™¨æ¸é›¶
msgid "Zero Bands"
msgstr "é »å¸¶æ¸é›¶"
- #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:803
+ #: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
#: ../plugins/converter/converter.glade.h:50
msgid "Presets"
msgstr "é è¨å€¼"
- #: ../plugins/gtkui/gtkui.c:163
+ #: ../plugins/gtkui/gtkui.c:167
#, c-format
msgid "1 day %d:%02d:%02d"
msgstr "1 天 %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:166
+ #: ../plugins/gtkui/gtkui.c:170
#, c-format
msgid "%d days %d:%02d:%02d"
msgstr "%d 天 %d:%02d:%02d"
- #: ../plugins/gtkui/gtkui.c:175
+ #: ../plugins/gtkui/gtkui.c:179
#, c-format
msgid "Stopped | %d tracks | %s total playtime"
msgstr "åœæ¢ | 第 %d 軌 | 總æ’放時間：%s"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
+msgid "Mono"
+msgstr "å–®è²é“"
+
+#: ../plugins/gtkui/gtkui.c:188 ../playlist.c:3108
++=======
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+ msgid "Mono"
+ msgstr "å–®è²é“"
+
+ #: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
++>>>>>>> upstream/0.6.2
msgid "Stereo"
msgstr "ç«‹é«”è²"
- #: ../plugins/gtkui/gtkui.c:213
+ #: ../plugins/gtkui/gtkui.c:215
#, c-format
msgid "| %4d kbps "
msgstr "| %4d kbps "
- #: ../plugins/gtkui/gtkui.c:219
+ #: ../plugins/gtkui/gtkui.c:221
msgid "Paused | "
msgstr "æš«åœ | "
- #: ../plugins/gtkui/gtkui.c:224
+ #: ../plugins/gtkui/gtkui.c:226
#, c-format
msgid ""
"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
msgstr ""
"%s%s %s| %dHz | %d ä½å…ƒ | %s | %d:%02d / %s | 第 %d 首 | 總æ’放時間：%s"
- #: ../plugins/gtkui/gtkui.c:706 ../plugins/gtkui/fileman.c:41
+ #: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
msgid "New Playlist"
msgstr "新增æ’放清單"
- #: ../plugins/gtkui/gtkui.c:709
+ #: ../plugins/gtkui/gtkui.c:699
#, c-format
msgid "New Playlist (%d)"
msgstr "新增æ’放清單 (%d)"
#. register widget types
- #: ../plugins/gtkui/gtkui.c:965
+ #: ../plugins/gtkui/gtkui.c:956
msgid "Playlist with tabs"
msgstr "å«åˆ†é çš„æ’放清單"
- #: ../plugins/gtkui/gtkui.c:966 ../plugins/gtkui/interface.c:2146
- #: ../plugins/gtkui/deadbeef.glade.h:125
+ #: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
+ #: ../plugins/gtkui/deadbeef.glade.h:128
msgid "Playlist"
msgstr "æ’放清單"
- #: ../plugins/gtkui/gtkui.c:969
+ #: ../plugins/gtkui/gtkui.c:960
msgid "Splitter (top and bottom)"
msgstr "分隔線 (上與下)"
- #: ../plugins/gtkui/gtkui.c:970
+ #: ../plugins/gtkui/gtkui.c:961
msgid "Splitter (left and right)"
msgstr "分隔線 (左與å³)"
#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
- #: ../plugins/gtkui/gtkui.c:973
+ #: ../plugins/gtkui/gtkui.c:964
msgid "Playlist tabs"
msgstr "æ’放清單分é "
- #: ../plugins/gtkui/gtkui.c:974
+ #: ../plugins/gtkui/gtkui.c:965
msgid "Selection properties"
msgstr "é¸å–屬性"
- #: ../plugins/gtkui/gtkui.c:975
+ #: ../plugins/gtkui/gtkui.c:966
msgid "Album art display"
msgstr "顯示專輯å°é¢"
- #: ../plugins/gtkui/gtkui.c:976
+ #: ../plugins/gtkui/gtkui.c:967
msgid "Scope"
msgstr "範åœ"
- #: ../plugins/gtkui/gtkui.c:977
+ #: ../plugins/gtkui/gtkui.c:968
msgid "Spectrum"
msgstr "é »èœ"
- #: ../plugins/gtkui/gtkui.c:978
+ #: ../plugins/gtkui/gtkui.c:969
msgid "HBox"
- msgstr ""
+ msgstr "HBox"
- #: ../plugins/gtkui/gtkui.c:979
+ #: ../plugins/gtkui/gtkui.c:970
msgid "VBox"
- msgstr ""
+ msgstr "VBox"
++<<<<<<< HEAD
+#: ../plugins/gtkui/gtkui.c:980 ../plugins/gtkui/widgets.c:3250
++=======
+ #: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
++>>>>>>> upstream/0.6.2
msgid "Button"
msgstr "按鈕"
- #: ../plugins/gtkui/gtkui.c:1166
+ #: ../plugins/gtkui/gtkui.c:972
+ msgid "Seekbar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:973
+ msgid "Playback controls"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:974
+ msgid "Volume bar"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:975
+ msgid "Chiptune voices"
+ msgstr ""
+
+ #: ../plugins/gtkui/gtkui.c:1150
msgid "Failed while reading help file"
msgstr "未能讀å–說明檔案"
- #: ../plugins/gtkui/gtkui.c:1176
+ #: ../plugins/gtkui/gtkui.c:1160
msgid "Failed to load help file"
msgstr "未能載入說明檔案"
- #: ../plugins/gtkui/gtkui.c:1187
+ #: ../plugins/gtkui/gtkui.c:1171
msgid ""
- "The player is currently running backgroud tasks. If you quit now, the tasks "
+ "The player is currently running background tasks. If you quit now, the tasks "
"will be cancelled or interrupted. This may result in data loss."
msgstr ""
- #: ../plugins/gtkui/gtkui.c:1189
+ #: ../plugins/gtkui/gtkui.c:1173
msgid "Do you still want to quit?"
msgstr "ä»ç„¶è¦é€€å‡ºï¼Ÿ"
- #: ../plugins/gtkui/gtkui.c:1190 ../plugins/gtkui/prefwin.c:349
- #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:862
- #: ../plugins/converter/convgui.c:1317 ../plugins/gtkui/actionhandlers.c:491
+ #: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
+ #: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
+ #: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
msgid "Warning"
msgstr "è¦å‘Š"
- #: ../plugins/gtkui/interface.c:144 ../plugins/gtkui/deadbeef.glade.h:1
+ #: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
msgid "_File"
msgstr "檔案(_F)"
- #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:2
+ #: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
msgid "_Open file(s)"
msgstr "開啟檔案(_O)"
- #: ../plugins/gtkui/interface.c:164 ../plugins/gtkui/deadbeef.glade.h:3
+ #: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
msgid "Add file(s)"
msgstr "åŠ å…¥æª”æ¡ˆ"
- #: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:4
+ #: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
msgid "Add folder(s)"
msgstr "åŠ å…¥è³‡æ–™å¤¾"
- #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/interface.c:3291
+ #: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
#: ../plugins/gtkui/deadbeef.glade.h:5
msgid "Add location"
msgstr "åŠ å…¥ä½å€"
- #: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/deadbeef.glade.h:6
+ #: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
msgid "New playlist"
msgstr "æ–°æ’放清單"
- #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:7
+ #: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
msgid "Load playlist"
msgstr "載入æ’放清單"
- #: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:8
+ #: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
msgid "Save playlist"
msgstr "儲å˜æ’放清單"
- #: ../plugins/gtkui/interface.c:206 ../plugins/gtkui/deadbeef.glade.h:9
+ #: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
msgid "_Quit"
msgstr "çµæŸ(_Q)"
- #: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:10
+ #: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
msgid "_Edit"
msgstr "編輯(_E)"
- #: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:11
+ #: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
msgid "_Clear"
msgstr "清除(_C)"
- #: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:12
+ #: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
msgid "Select all"
msgstr "å…¨é¸"
- #: ../plugins/gtkui/interface.c:233 ../plugins/gtkui/deadbeef.glade.h:13
+ #: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
msgid "Deselect all"
msgstr "全部å–消é¸å–"
- #: ../plugins/gtkui/interface.c:237 ../plugins/gtkui/deadbeef.glade.h:14
+ #: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
msgid "Invert selection"
msgstr "åå‘é¸å–"
- #: ../plugins/gtkui/interface.c:241 ../plugins/gtkui/deadbeef.glade.h:15
+ #: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
msgid "Selection"
msgstr "é¸å–"
- #: ../plugins/gtkui/interface.c:248 ../plugins/gtkui/plcommon.c:579
- #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:628
+ #: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
+ #: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
#: ../plugins/converter/converter.glade.h:46
- #: ../plugins/shellexecui/interface.c:65
+ #: ../plugins/shellexecui/interface.c:66
#: ../plugins/shellexecui/shellexec.glade.h:4
msgid "Remove"
msgstr "移除"
- #: ../plugins/gtkui/interface.c:256 ../plugins/gtkui/deadbeef.glade.h:17
+ #: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
msgid "Crop"
msgstr "剪è£"
- #: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:18
+ #: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
msgid "_Find"
msgstr "尋找(_F)"
- #: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:19
+ #: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
msgid "Sort by"
msgstr "排åºä¾æ“š"
- #: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/interface.c:1463
- #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/prefwin.c:321
- #: ../plugins/gtkui/search.c:424 ../plugins/gtkui/deadbeef.glade.h:20
- #: ../plugins/converter/convgui.c:893 ../plugins/converter/convgui.c:1392
- #: ../plugins/converter/interface.c:605
+ #: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
+ #: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
+ #: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
+ #: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
+ #: ../plugins/converter/interface.c:606
#: ../plugins/converter/converter.glade.h:43
- #: ../plugins/shellexecui/shellexecui.c:322
+ #: ../plugins/shellexecui/shellexecui.c:324
msgid "Title"
msgstr "æŒå"
- #: ../plugins/gtkui/interface.c:275 ../plugins/gtkui/deadbeef.glade.h:21
+ #: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
msgid "Track number"
msgstr "曲號"
- #: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/interface.c:1462
- #: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:22
+ #: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
+ #: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
#: ../translation/extra.c:73
msgid "Album"
msgstr "專輯"
#. Track properties dialog
- #: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/interface.c:1461
- #: ../plugins/gtkui/plcommon.c:1156 ../plugins/gtkui/deadbeef.glade.h:23
+ #: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
+ #: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
#: ../translation/extra.c:69
msgid "Artist"
msgstr "è—人"
- #: ../plugins/gtkui/interface.c:287 ../plugins/gtkui/deadbeef.glade.h:24
+ #: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
#: ../translation/extra.c:74
msgid "Date"
msgstr "日期"
- #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:359
+ #: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
#: ../plugins/gtkui/deadbeef.glade.h:25
msgid "Random"
msgstr "隨機"
- #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1467
- #: ../plugins/gtkui/plcommon.c:1160 ../plugins/gtkui/deadbeef.glade.h:26
+ #: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
+ #: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
msgid "Custom"
msgstr "自訂"
- #: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/interface.c:1796
+ #: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
#: ../plugins/gtkui/deadbeef.glade.h:27
msgid "Preferences"
msgstr "å好è¨å®š"
- #: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:28
+ #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
msgid "_View"
msgstr "檢視(_V)"
- #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/deadbeef.glade.h:29
+ #: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
msgid "Status bar"
msgstr "狀態列"
- #: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:30
+ #: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
msgid "Equalizer"
msgstr "ç‰åŒ–器"
- #: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:31
+ #: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
msgid "Design mode"
- msgstr ""
+ msgstr "è¨è¨ˆæ¨¡å¼"
- #: ../plugins/gtkui/interface.c:327 ../plugins/gtkui/deadbeef.glade.h:32
+ #: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
msgid "_Playback"
msgstr "æ’放(_P)"
- #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/interface.c:3567
+ #: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
#: ../plugins/gtkui/deadbeef.glade.h:33
msgid "Order"
msgstr "é †åº"
- #: ../plugins/gtkui/interface.c:341 ../plugins/gtkui/deadbeef.glade.h:34
+ #: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
msgid "Linear"
msgstr "線性"
- #: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:35
+ #: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
msgid "Shuffle tracks"
msgstr "調亂æŒæ›²"
- #: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/deadbeef.glade.h:36
+ #: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
msgid "Shuffle albums"
msgstr "調亂專輯"
- #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:37
+ #: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
msgid "Looping"
msgstr "é‡è¤‡"
- #: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:38
+ #: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
msgid "Loop all"
msgstr "é‡è¤‡å…¨éƒ¨"
- #: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:39
+ #: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
msgid "Loop single song"
msgstr "é‡è¤‡å–®ä¸€æ›²ç›®"
- #: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:40
+ #: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
msgid "Don't loop"
msgstr "ä¸è¦é‡è¤‡æ’放"
- #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:41
+ #: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
msgid "Scroll follows playback"
msgstr "隨æ’放æ²å‹•"
- #: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/deadbeef.glade.h:42
+ #: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
msgid "Cursor follows playback"
msgstr "隨æ’放移動游標"
- #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:43
- msgid "Stop after current"
- msgstr "æ’放當å‰æŒæ›²å¾Œåœæ¢"
+ #: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+ msgid "Stop after current track"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+ msgid "Stop after current album"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:408 ../plugins/gtkui/deadbeef.glade.h:44
+ #: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
msgid "Jump to current track"
msgstr "跳至當å‰æŒæ›²"
- #: ../plugins/gtkui/interface.c:412 ../plugins/gtkui/interface.c:419
- #: ../plugins/gtkui/deadbeef.glade.h:45
+ #: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
+ #: ../plugins/gtkui/deadbeef.glade.h:46
msgid "_Help"
msgstr "說明(_H)"
- #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:46
+ #: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
msgid "_ChangeLog"
msgstr "_ChangeLog"
- #: ../plugins/gtkui/interface.c:436 ../plugins/gtkui/deadbeef.glade.h:47
+ #: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
msgid "_GPLv2"
msgstr "_GPLv2"
- #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:48
+ #: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
msgid "_LGPLv2.1"
msgstr "_LGPLv2.1"
- #: ../plugins/gtkui/interface.c:449 ../plugins/gtkui/deadbeef.glade.h:49
+ #: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
msgid "_About"
msgstr "關於(_A)"
- #: ../plugins/gtkui/interface.c:457 ../plugins/gtkui/deadbeef.glade.h:50
+ #: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
msgid "_Translators"
msgstr "ç¿»è¯è€…(_T)"
- #: ../plugins/gtkui/interface.c:828 ../plugins/gtkui/deadbeef.glade.h:51
+ #: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
msgid "Search"
msgstr "æœå°‹"
- #: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:52
+ #: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
msgid "Stop"
msgstr "åœæ¢"
- #: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:53
+ #: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
msgid "Play"
msgstr "æ’放"
- #: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:54
+ #: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
msgid "Pause"
msgstr "æš«åœ"
- #: ../plugins/gtkui/interface.c:924 ../plugins/gtkui/deadbeef.glade.h:55
+ #: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
msgid "Previous"
msgstr "上一首"
- #: ../plugins/gtkui/interface.c:932 ../plugins/gtkui/deadbeef.glade.h:56
+ #: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
msgid "Next"
msgstr "下一首"
- #: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:57
+ #: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
msgid "Play Random"
msgstr "隨機æ’放"
- #: ../plugins/gtkui/interface.c:949 ../plugins/gtkui/deadbeef.glade.h:58
+ #: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
msgid "About"
msgstr "關於"
- #: ../plugins/gtkui/interface.c:962 ../plugins/gtkui/deadbeef.glade.h:59
+ #: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
msgid "Quit"
msgstr "çµæŸ"
- #: ../plugins/gtkui/interface.c:1082 ../plugins/gtkui/deadbeef.glade.h:60
- #: ../plugins/converter/convgui.c:1421 ../plugins/converter/convgui.c:1429
- #: ../plugins/gtkui/actionhandlers.c:430
+ #: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
+ #: ../plugins/gtkui/actionhandlers.c:476
msgid "Help"
msgstr "說明"
- #: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:61
+ #: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
+ #: ../plugins/gtkui/deadbeef.glade.h:62
msgid "Track Properties"
msgstr "æŒæ›²å±¬æ€§"
- #: ../plugins/gtkui/interface.c:1173 ../plugins/gtkui/deadbeef.glade.h:62
+ #: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
msgid "Location:"
msgstr "ä½å€:"
- #: ../plugins/gtkui/interface.c:1214 ../plugins/gtkui/deadbeef.glade.h:63
+ #: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
msgid "Settings"
msgstr "è¨å®š"
- #: ../plugins/gtkui/interface.c:1240 ../plugins/gtkui/deadbeef.glade.h:64
+ #: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
msgid "_Apply"
msgstr "套用(_A)"
- #: ../plugins/gtkui/interface.c:1261 ../plugins/gtkui/interface.c:1307
- #: ../plugins/gtkui/deadbeef.glade.h:65
+ #: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
+ #: ../plugins/gtkui/deadbeef.glade.h:66
msgid "_Close"
msgstr "關閉(_C)"
- #: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:66
+ #: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
msgid "Metadata"
msgstr "元數據"
- #: ../plugins/gtkui/interface.c:1311 ../plugins/gtkui/plcommon.c:725
- #: ../plugins/gtkui/deadbeef.glade.h:67
+ #: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
msgid "Properties"
msgstr "屬性"
- #: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:3192
- #: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/converter/interface.c:378
+ #: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
+ #: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
#: ../plugins/converter/converter.glade.h:22
- #: ../plugins/shellexecui/interface.c:159
+ #: ../plugins/shellexecui/interface.c:163
#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
msgid "Title:"
msgstr "æŒå："
- #: ../plugins/gtkui/interface.c:1441 ../plugins/gtkui/deadbeef.glade.h:71
+ #: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
msgid "Enter new column title here"
msgstr "在æ¤è¼¸å…¥æ¬„ä½å稱"
- #: ../plugins/gtkui/interface.c:1449 ../plugins/gtkui/deadbeef.glade.h:72
+ #: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
msgid "Type:"
msgstr "類型："
- #: ../plugins/gtkui/interface.c:1457
+ #: ../plugins/gtkui/interface.c:1343
msgid "Item Index"
msgstr "é …ç›®ç´¢å¼•"
- #. create default set of columns
- #: ../plugins/gtkui/interface.c:1458 ../plugins/gtkui/mainplaylist.c:350
+ #: ../plugins/gtkui/interface.c:1344
msgid "Playing"
msgstr "æ£åœ¨æ’放"
- #: ../plugins/gtkui/interface.c:1459
+ #: ../plugins/gtkui/interface.c:1345
msgid "Album Art"
msgstr "專輯å°é¢"
- #: ../plugins/gtkui/interface.c:1460
+ #: ../plugins/gtkui/interface.c:1346
msgid "Artist - Album"
msgstr "è—人 - 專輯"
- #: ../plugins/gtkui/interface.c:1464 ../plugins/gtkui/mainplaylist.c:354
- #: ../plugins/gtkui/search.c:425
+ #: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
+ #: ../plugins/gtkui/search.c:422
msgid "Duration"
msgstr "長度"
- #: ../plugins/gtkui/interface.c:1465 ../translation/extra.c:75
+ #: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
msgid "Track Number"
msgstr "æŒæ›²ç·¨è™Ÿ"
- #: ../plugins/gtkui/interface.c:1466 ../translation/extra.c:72
+ #: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
msgid "Band / Album Artist"
msgstr "樂隊 / 專輯è—人"
- #: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:3419
- #: ../plugins/gtkui/deadbeef.glade.h:84
+ #: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
+ #: ../plugins/gtkui/deadbeef.glade.h:85
msgid "Format:"
msgstr "æ ¼å¼ï¼š"
- #: ../plugins/gtkui/interface.c:1498 ../plugins/gtkui/deadbeef.glade.h:85
+ #: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
msgid "Alignment:"
msgstr "å°é½Šï¼š"
- #: ../plugins/gtkui/interface.c:1506
+ #: ../plugins/gtkui/interface.c:1392
msgid "Left"
msgstr "å·¦"
- #: ../plugins/gtkui/interface.c:1507
+ #: ../plugins/gtkui/interface.c:1393
msgid "Right"
msgstr "å³"
- #: ../plugins/gtkui/interface.c:1530 ../plugins/gtkui/interface.c:3223
- #: ../plugins/gtkui/interface.c:3334 ../plugins/gtkui/interface.c:3460
- #: ../plugins/gtkui/deadbeef.glade.h:68
+ #: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
+ #: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
+ #: ../plugins/gtkui/deadbeef.glade.h:69
msgid "_Cancel"
msgstr "å–消(_C)"
- #: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/interface.c:3244
- #: ../plugins/gtkui/interface.c:3355 ../plugins/gtkui/interface.c:3481
- #: ../plugins/gtkui/deadbeef.glade.h:69
+ #: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
+ #: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
+ #: ../plugins/gtkui/deadbeef.glade.h:70
msgid "_OK"
msgstr "確定(_O)"
- #: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:88
+ #: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
msgid "Output plugin:"
msgstr "輸出外掛程å¼ï¼š"
- #: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:89
+ #: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
msgid "Output device:"
msgstr "輸出è£ç½®ï¼š"
- #: ../plugins/gtkui/interface.c:1839 ../plugins/gtkui/deadbeef.glade.h:90
+ #: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
msgid "Always convert 8 bit audio to 16 bit"
msgstr "å°‡ 8 ä½å…ƒéŸ³è¨Šè½‰ç‚º 16 ä½å…ƒ"
- #: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:91
+ #: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
msgid "Always convert 16 bit audio to 24 bit"
msgstr ""
- #: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:92
+ #: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
msgid "Sound"
msgstr "è²éŸ³"
- #: ../plugins/gtkui/interface.c:1860 ../plugins/gtkui/deadbeef.glade.h:93
+ #: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
msgid "Replaygain mode:"
msgstr "æ’放增益模å¼ï¼š"
- #: ../plugins/gtkui/interface.c:1869
+ #: ../plugins/gtkui/interface.c:1757
msgid "Disable"
msgstr "åœç”¨"
- #: ../plugins/gtkui/interface.c:1870
+ #: ../plugins/gtkui/interface.c:1758
msgid "Track"
msgstr "æŒæ›²"
- #: ../plugins/gtkui/interface.c:1873 ../plugins/gtkui/deadbeef.glade.h:97
+ #: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
msgid "Replaygain peak scale"
msgstr "æ’放增益峰值比例"
- #: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1922
- #: ../plugins/gtkui/deadbeef.glade.h:98
+ #: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
+ #: ../plugins/gtkui/deadbeef.glade.h:99
msgid "-12 dB"
msgstr "-12 dB"
- #: ../plugins/gtkui/interface.c:1898 ../plugins/gtkui/interface.c:1932
- #: ../plugins/gtkui/deadbeef.glade.h:99
+ #: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
+ #: ../plugins/gtkui/deadbeef.glade.h:100
msgid "+12 dB"
msgstr "+12 dB"
- #: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:100
+ #: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
msgid "Replaygain preamp:"
msgstr "æ’放增益å‰ç½®æ”¾å¤§å™¨ï¼š"
- #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:101
+ #: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
msgid "Global preamp:"
msgstr "全域å‰ç½®æ”¾å¤§å™¨ï¼š"
- #: ../plugins/gtkui/interface.c:1940 ../plugins/gtkui/deadbeef.glade.h:102
+ #: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
msgid "Add files from command line (or file manager) to this playlist:"
msgstr "由指令列 (或檔案管ç†å“¡) å°‡æª”æ¡ˆåŠ å…¥è‡³æ¤æ’放清單："
- #: ../plugins/gtkui/interface.c:1949 ../plugins/gtkui/deadbeef.glade.h:103
+ #: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
msgid "Resume previous session on startup"
msgstr "啟動時繼續å‰ä¸€ä½œæ¥"
- #: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:104
+ #: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
msgid "Don't add from archives when adding folders"
msgstr "åŠ å…¥è³‡æ–™å¤¾æ™‚ä¸è¦åŠ 入壓縮檔"
- #: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:105
- msgid "Auto-reset \"Stop after current\""
- msgstr "自動é‡è¨ã€Œæ’放當å‰æŒæ›²å¾Œåœæ¢ã€"
+ #: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+ msgid "\"Stop after current track\" option will switch off after triggering"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+ msgid "\"Stop after current album\" option will switch off after triggering"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:106
+ #: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
msgid "Playback"
msgstr "æ’放"
- #: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2692
- #: ../plugins/gtkui/deadbeef.glade.h:107 ../plugins/converter/interface.c:632
+ #: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
+ #: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
#: ../plugins/converter/converter.glade.h:47
msgid "Configure"
msgstr "è¨å®š"
- #: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:108
+ #: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
msgid "DSP Chain Preset"
msgstr "DSP 連鎖é è¨å€¼"
- #: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:109
+ #: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
msgid "_Load"
msgstr "載入(_L)"
- #: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:110
+ #: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
msgid "DSP"
msgstr "DSP"
- #: ../plugins/gtkui/interface.c:2047 ../plugins/gtkui/deadbeef.glade.h:111
+ #: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
msgid "Close minimizes to tray"
msgstr "關閉時縮å°è‡³ç³»çµ±åŒ£"
- #: ../plugins/gtkui/interface.c:2051 ../plugins/gtkui/deadbeef.glade.h:112
+ #: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
msgid "Hide system tray icon"
msgstr "éš±è—系統匣圖示"
- #: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:113
+ #: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+ msgid "Enable Japanese SHIFT-JIS detection and recoding"
+ msgstr ""
+
+ #: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
msgid "Enable Russian CP1251 detection and recoding"
msgstr "啟用俄羅斯文 CP1251 åµæ¸¬èˆ‡é‡æ–°ç·¨ç¢¼"
- #: ../plugins/gtkui/interface.c:2059 ../plugins/gtkui/deadbeef.glade.h:114
+ #: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
msgid "Enable Chinese CP936 detection and recoding"
msgstr "啟用ä¸æ–‡ CP936 åµæ¸¬èˆ‡é‡æ–°ç·¨ç¢¼"
- #: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:115
+ #: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
msgid "Interface refresh rate (times per second):"
msgstr "介é¢é‡åˆ·çŽ‡ (æ¯ç§’次數)："
- #: ../plugins/gtkui/interface.c:2081 ../plugins/gtkui/deadbeef.glade.h:116
+ #: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
msgid "Titlebar text while playing:"
msgstr "æ’放時標題列文å—："
- #: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:117
+ #: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
msgid "Titlebar text while stopped:"
msgstr "åœæ¢æ™‚標題列文å—："
- #: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:118
+ #: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
msgid "GUI Plugin (changing requires restart):"
msgstr "圖åƒç”¨æˆ¶ä»‹é¢å¤–æŽ›ç¨‹å¼ (é‡æ–°å•Ÿå‹•å§‹ç”Ÿæ•ˆ)："
- #: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:119
+ #: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
msgid "Player"
msgstr ""
- #: ../plugins/gtkui/interface.c:2126 ../plugins/gtkui/deadbeef.glade.h:120
+ #: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
msgid "Close playlists with middle mouse button"
msgstr ""
- #: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:121
+ #: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
msgid "Draw playing track using bold font"
msgstr ""
- #: ../plugins/gtkui/interface.c:2134 ../plugins/gtkui/deadbeef.glade.h:122
- msgid "Hide \"Delete from disk\" context menu item"
- msgstr "éš±è—「自ç£ç¢Ÿåˆªé™¤ã€å¢ƒæ³é¸å–®é …ç›®"
+ #: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
+ msgid "Hide \"Remove From Disk\" context menu item"
+ msgstr ""
- #: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:123
+ #: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
msgid "Auto-name playlists when adding a single folder"
msgstr "åŠ å…¥å–®ä¸€è³‡æ–™å¤¾æ™‚è‡ªå‹•ç‚ºæ’放清單命å"
- #: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:124
+ #: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
msgid "Auto-resize columns to fit the window"
msgstr ""
- #: ../plugins/gtkui/interface.c:2150 ../plugins/gtkui/deadbeef.glade.h:126
+ #: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
msgid "GUI/Misc"
msgstr "圖形介é¢/é›œé …"
- #: ../plugins/gtkui/interface.c:2165 ../plugins/gtkui/interface.c:2209
- #: ../plugins/gtkui/deadbeef.glade.h:127
+ #: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
+ #: ../plugins/gtkui/deadbeef.glade.h:130
msgid "Override"
msgstr "優先於"
- #: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:128
+ #: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
msgid "Foreground"
msgstr "å‰æ™¯"
- #: ../plugins/gtkui/interface.c:2181 ../plugins/gtkui/deadbeef.glade.h:129
+ #: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
msgid "Background"
msgstr "背景"
- #: ../plugins/gtkui/interface.c:2200 ../plugins/gtkui/deadbeef.glade.h:130
+ #: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
msgid "Seekbar/Volumebar colors"
msgstr "æœç´¢åˆ—ï¼éŸ³é‡åˆ— 色彩"
- #: ../plugins/gtkui/interface.c:2218 ../plugins/gtkui/deadbeef.glade.h:131
+ #: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
msgid "Middle"
msgstr "ä¸ç‰"
- #: ../plugins/gtkui/interface.c:2225 ../plugins/gtkui/deadbeef.glade.h:132
+ #: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
msgid "Light"
msgstr "光亮"
- #: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/deadbeef.glade.h:133
+ #: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
msgid "Dark"
msgstr "æš—æ·¡"
- #: ../plugins/gtkui/interface.c:2263 ../plugins/gtkui/deadbeef.glade.h:134
+ #: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
msgid "Base"
msgstr "基礎"
- #: ../plugins/gtkui/interface.c:2270 ../plugins/gtkui/interface.c:2327
- #: ../plugins/gtkui/deadbeef.glade.h:135
+ #: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
+ #: ../plugins/gtkui/deadbeef.glade.h:138
msgid "Text"
msgstr "æ–‡å—"
- #: ../plugins/gtkui/interface.c:2283 ../plugins/gtkui/deadbeef.glade.h:136
+ #: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
msgid "Tab strip colors"
msgstr "分é æ¢è‰²å½©"
- #: ../plugins/gtkui/interface.c:2292 ../plugins/gtkui/deadbeef.glade.h:137
+ #: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
msgid "Override (looses GTK treeview theming, but speeds up rendering)"
msgstr "優先於 (放鬆 GTK æ¨¹ç‹€ç›®éŒ„ä½ˆæ™¯ä¸»é¡Œï¼Œä½†æœƒåŠ é€Ÿæˆåƒ)"
- #: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:138
+ #: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
msgid "Even row"
msgstr "å¶æ•¸åˆ—"
- #: ../plugins/gtkui/interface.c:2308 ../plugins/gtkui/deadbeef.glade.h:139
+ #: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
msgid "Odd row"
msgstr "單數列"
- #: ../plugins/gtkui/interface.c:2334 ../plugins/gtkui/deadbeef.glade.h:140
+ #: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
msgid "Selected row"
msgstr "所é¸åˆ—"
- #: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:141
+ #: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
msgid "Selected text"
msgstr "所é¸æ–‡å—"
- #: ../plugins/gtkui/interface.c:2366 ../plugins/gtkui/deadbeef.glade.h:142
+ #: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
msgid "Cursor"
msgstr "游標"
- #: ../plugins/gtkui/interface.c:2379 ../plugins/gtkui/deadbeef.glade.h:143
+ #: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
msgid "Playlist colors"
msgstr "æ’放清單色彩"
- #: ../plugins/gtkui/interface.c:2383 ../plugins/gtkui/deadbeef.glade.h:144
+ #: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
msgid "Colors"
msgstr "色彩"
- #: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:145
+ #: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
msgid "Enable Proxy Server"
msgstr "啟用代ç†ä¼ºæœå™¨"
- #: ../plugins/gtkui/interface.c:2400 ../plugins/gtkui/deadbeef.glade.h:146
+ #: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
msgid "Proxy Server Address:"
msgstr "代ç†ä¼ºæœå™¨ä½å€ï¼š"
- #: ../plugins/gtkui/interface.c:2414 ../plugins/gtkui/deadbeef.glade.h:147
+ #: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
msgid "Proxy Server Port:"
msgstr "代ç†ä¼ºæœå™¨é€£æŽ¥åŸ ："
- #: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:148
+ #: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
msgid "Proxy Type:"
msgstr "代ç†é¡žåž‹ï¼š"
- #: ../plugins/gtkui/interface.c:2447 ../plugins/gtkui/deadbeef.glade.h:149
+ #: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
msgid "Proxy Username:"
msgstr "代ç†ä½¿ç”¨è€…å稱："
- #: ../plugins/gtkui/interface.c:2460 ../plugins/gtkui/deadbeef.glade.h:150
+ #: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
msgid "Proxy Password:"
msgstr "代ç†å¯†ç¢¼ï¼š"
- #: ../plugins/gtkui/interface.c:2478 ../plugins/gtkui/deadbeef.glade.h:151
+ #: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
msgid "HTTP User Agent:"
msgstr "HTTP 使用者代ç†:"
- #: ../plugins/gtkui/interface.c:2491 ../plugins/gtkui/interface.c:4195
- #: ../plugins/gtkui/deadbeef.glade.h:152
+ #: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
+ #: ../plugins/gtkui/deadbeef.glade.h:155
msgid "Edit Content-Type Mapping"
msgstr ""
- #: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:153
+ #: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
msgid "Network"
msgstr "網路"
- #: ../plugins/gtkui/interface.c:2508 ../plugins/gtkui/deadbeef.glade.h:154
+ #: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
msgid "Assigned Hotkeys:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2543 ../plugins/gtkui/interface.c:4356
- #: ../plugins/gtkui/deadbeef.glade.h:155
+ #: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
+ #: ../plugins/gtkui/deadbeef.glade.h:158
msgid "Action:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2548 ../plugins/gtkui/interface.c:2561
- #: ../plugins/gtkui/interface.c:4360 ../plugins/gtkui/deadbeef.glade.h:156
+ #: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
+ #: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
msgid "<Not set>"
- msgstr ""
+ msgstr "<Not set>"
- #: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/deadbeef.glade.h:157
+ #: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
msgid "Key combination:"
msgstr ""
- #: ../plugins/gtkui/interface.c:2565 ../plugins/gtkui/deadbeef.glade.h:158
+ #: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
msgid "Global hotkey"
- msgstr ""
+ msgstr "全域快速éµ"
- #: ../plugins/gtkui/interface.c:2577 ../plugins/gtkui/deadbeef.glade.h:159
+ #: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
msgid ""
"Use the Apply button to save your changes,\n"
"or the Revert button to undo your changes.\n"
@@@ -879,122 -906,128 +924,128 @@@
"if you don't press Apply."
msgstr ""
- #: ../plugins/gtkui/interface.c:2614 ../plugins/gtkui/deadbeef.glade.h:163
+ #: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
msgid "_Defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:2618 ../plugins/gtkui/deadbeef.glade.h:164
+ #: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
msgid "Hotkeys"
- msgstr ""
+ msgstr "快速éµ"
- #: ../plugins/gtkui/interface.c:2649 ../plugins/gtkui/deadbeef.glade.h:165
+ #: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
msgid "Version: "
msgstr "版本："
- #: ../plugins/gtkui/interface.c:2713 ../plugins/gtkui/deadbeef.glade.h:166
+ #: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
#: ../translation/extra.c:82
msgid "Copyright"
msgstr "版權"
- #: ../plugins/gtkui/interface.c:2723 ../plugins/gtkui/deadbeef.glade.h:167
+ #: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
#: ../plugins/gtkui/ctmapping.c:131
msgid "Plugins"
msgstr "外掛程å¼"
- #: ../plugins/gtkui/interface.c:3302 ../plugins/gtkui/deadbeef.glade.h:168
+ #: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
msgid "URL:"
msgstr "網å€ï¼š"
- #: ../plugins/gtkui/interface.c:3404 ../plugins/gtkui/deadbeef.glade.h:169
- msgid "Group By ..."
+ #: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
+ #: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
+ #: ../plugins/gtkui/deadbeef.glade.h:172
+ msgid "Set Custom Title"
msgstr ""
- #: ../plugins/gtkui/interface.c:3528 ../plugins/gtkui/deadbeef.glade.h:170
+ #: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+ msgid "Group By ..."
+ msgstr "ä¾æ“š...分組"
+
+ #: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
msgid "Sort by ..."
- msgstr ""
+ msgstr "ä¾æ“š...排åº"
- #: ../plugins/gtkui/interface.c:3544 ../plugins/gtkui/deadbeef.glade.h:171
+ #: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
msgid "Format"
msgstr "æ ¼å¼"
- #: ../plugins/gtkui/interface.c:3574
+ #: ../plugins/gtkui/interface.c:3502
msgid "Ascending"
msgstr "é †åº"
- #: ../plugins/gtkui/interface.c:3575
+ #: ../plugins/gtkui/interface.c:3503
msgid "Descending"
msgstr "逆åº"
- #: ../plugins/gtkui/interface.c:3628 ../plugins/gtkui/deadbeef.glade.h:174
- #: ../plugins/converter/interface.c:733
+ #: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/converter/interface.c:734
#: ../plugins/converter/converter.glade.h:48
msgid "Select DSP Plugin"
msgstr "é¸å– DSP 外掛程å¼"
- #: ../plugins/gtkui/interface.c:3644 ../plugins/gtkui/deadbeef.glade.h:175
- #: ../plugins/converter/convgui.c:1194 ../plugins/converter/interface.c:749
+ #: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
msgid "Plugin"
msgstr "外掛程å¼"
- #: ../plugins/gtkui/interface.c:3729 ../plugins/gtkui/deadbeef.glade.h:176
+ #: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
msgid "Tag Writer Settings"
msgstr "標記寫入器è¨å®š"
- #: ../plugins/gtkui/interface.c:3760 ../plugins/gtkui/deadbeef.glade.h:177
+ #: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
msgid "Write ID3v2"
msgstr "寫入 ID3v2"
- #: ../plugins/gtkui/interface.c:3764 ../plugins/gtkui/interface.c:3891
- #: ../plugins/gtkui/deadbeef.glade.h:178
+ #: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
+ #: ../plugins/gtkui/deadbeef.glade.h:182
msgid "Write ID3v1"
msgstr "寫入 ID3v1"
- #: ../plugins/gtkui/interface.c:3768 ../plugins/gtkui/interface.c:3847
- #: ../plugins/gtkui/interface.c:3887 ../plugins/gtkui/deadbeef.glade.h:179
+ #: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
+ #: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
msgid "Write APEv2"
msgstr "寫入 APEv2"
- #: ../plugins/gtkui/interface.c:3776 ../plugins/gtkui/interface.c:3855
- #: ../plugins/gtkui/deadbeef.glade.h:180
+ #: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
+ #: ../plugins/gtkui/deadbeef.glade.h:184
msgid "Strip ID3v2"
msgstr "ç 掉 ID3v2"
- #: ../plugins/gtkui/interface.c:3780 ../plugins/gtkui/interface.c:3903
- #: ../plugins/gtkui/deadbeef.glade.h:181
+ #: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
+ #: ../plugins/gtkui/deadbeef.glade.h:185
msgid "Strip ID3v1"
msgstr "ç 掉 ID3v1"
- #: ../plugins/gtkui/interface.c:3784 ../plugins/gtkui/interface.c:3859
- #: ../plugins/gtkui/interface.c:3899 ../plugins/gtkui/deadbeef.glade.h:182
+ #: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
+ #: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
msgid "Strip APEv2"
msgstr "ç 掉 APEv2"
- #: ../plugins/gtkui/interface.c:3792 ../plugins/gtkui/deadbeef.glade.h:183
+ #: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
msgid "ID3v2 version"
msgstr "ID3v2 版本"
- #: ../plugins/gtkui/interface.c:3799
+ #: ../plugins/gtkui/interface.c:3727
msgid "2.3 (Recommended)"
msgstr "2.3 (建è°ç‰ˆæœ¬)"
- #: ../plugins/gtkui/interface.c:3800
+ #: ../plugins/gtkui/interface.c:3728
msgid "2.4"
msgstr "2.4"
- #: ../plugins/gtkui/interface.c:3806 ../plugins/gtkui/deadbeef.glade.h:186
+ #: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
msgid "ID3v1 character encoding (default is iso8859-1)"
msgstr "ID3v1 å—元編碼 (é è¨ç‚º iso8859-1)"
- #: ../plugins/gtkui/interface.c:3843 ../plugins/gtkui/deadbeef.glade.h:187
+ #: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
msgid "Write ID3v2.4"
msgstr "寫入 ID3v2.4"
- #: ../plugins/gtkui/interface.c:4045 ../plugins/gtkui/deadbeef.glade.h:188
+ #: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
msgid "Content-Type Mapping"
- msgstr ""
+ msgstr "目錄類型å–代"
- #: ../plugins/gtkui/interface.c:4068 ../plugins/gtkui/deadbeef.glade.h:189
+ #: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
msgid ""
"This table defines the binding between network stream content types and "
"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@@ -1002,91 -1035,100 +1053,104 @@@
"plugin, or \"ffmpeg\" plugin."
msgstr ""
- #: ../plugins/gtkui/interface.c:4116 ../plugins/gtkui/deadbeef.glade.h:190
+ #: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
msgid "Reset to defaults"
msgstr ""
- #: ../plugins/gtkui/interface.c:4211 ../plugins/gtkui/deadbeef.glade.h:191
+ #: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
msgid "Content-Type:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4224 ../plugins/gtkui/deadbeef.glade.h:192
+ #: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
msgid "Plugins:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4292 ../plugins/gtkui/deadbeef.glade.h:193
+ #: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
msgid "Button properties"
msgstr ""
- #: ../plugins/gtkui/interface.c:4307 ../plugins/gtkui/deadbeef.glade.h:194
+ #: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
msgid "Color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4319 ../plugins/gtkui/deadbeef.glade.h:195
+ #: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
msgid "Text color:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4331 ../plugins/gtkui/deadbeef.glade.h:196
+ #: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
msgid "Icon:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4343 ../plugins/gtkui/deadbeef.glade.h:197
+ #: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
msgid "Label:"
msgstr ""
- #: ../plugins/gtkui/interface.c:4424 ../plugins/gtkui/deadbeef.glade.h:198
+ #: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
msgid "Select action"
msgstr ""
- #: ../plugins/gtkui/mainplaylist.c:351 ../plugins/gtkui/search.c:422
+ #: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+ msgid ""
+ "This dialog allows to set custom title for any track. This is most useful "
+ "for radio stations. An option to set the custom title is also present in the "
+ "\"Add Location\" dialog. The title itself is visible in columns displaying "
+ "the \"Artist\" metadata field. It should look like \"[custom] artist\" if "
+ "the Artist field is present, or just \"custom\" otherwise."
+ msgstr ""
+
+ #: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
msgid "Artist / Album"
msgstr "è—人 / 專輯"
- #: ../plugins/gtkui/mainplaylist.c:352 ../plugins/gtkui/search.c:423
+ #: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
msgid "Track No"
msgstr "æŒæ›²ç·¨è™Ÿ"
- #: ../plugins/gtkui/plcommon.c:556
- msgid "Add to playback queue"
- msgstr "åŠ å…¥è‡³æ’放佇列"
+ #: ../plugins/gtkui/plcommon.c:637
+ msgid "Add To Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:561
- msgid "Remove from playback queue"
- msgstr "自æ’放佇列移除"
+ #: ../plugins/gtkui/plcommon.c:642
+ msgid "Remove From Playback Queue"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:569
- msgid "Reload metadata"
- msgstr "é‡è®€å…ƒæ•¸æ“š"
+ #: ../plugins/gtkui/plcommon.c:650
+ msgid "Reload Metadata"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:587
- msgid "Remove from disk"
- msgstr "自ç£ç¢Ÿç§»é™¤"
+ #: ../plugins/gtkui/plcommon.c:668
+ msgid "Remove From Disk"
+ msgstr ""
- #: ../plugins/gtkui/plcommon.c:991 ../plugins/gtkui/plcommon.c:1118
+ #: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
msgid "Add column"
msgstr "åŠ å…¥æ¬„ä½"
- #: ../plugins/gtkui/plcommon.c:1021 ../plugins/gtkui/plcommon.c:1122
+ #: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
msgid "Edit column"
msgstr "編輯欄ä½"
- #: ../plugins/gtkui/plcommon.c:1126
+ #: ../plugins/gtkui/plcommon.c:1224
msgid "Remove column"
msgstr "移除欄ä½"
- #: ../plugins/gtkui/plcommon.c:1136
+ #: ../plugins/gtkui/plcommon.c:1234
msgid "Pin groups when scrolling"
msgstr ""
- #: ../plugins/gtkui/plcommon.c:1141
+ #: ../plugins/gtkui/plcommon.c:1239
msgid "Group by"
msgstr "åˆ†çµ„æ ¹æ“šï¼š"
++<<<<<<< HEAD
+#: ../plugins/gtkui/plcommon.c:1148 ../plugins/gtkui/widgets.c:3346
++=======
+ #: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
++>>>>>>> upstream/0.6.2
msgid "None"
msgstr "ç„¡"
- #: ../plugins/gtkui/plcommon.c:1152
+ #: ../plugins/gtkui/plcommon.c:1250
msgid "Artist/Date/Album"
msgstr "è—人/日期/專輯"
@@@ -1103,11 -1145,11 +1167,11 @@@ msgstr "è¨å®š %s
msgid "Default Audio Device"
msgstr "é è¨éŸ³è¨Šè£ç½®"
- #: ../plugins/gtkui/prefwin.c:346
+ #: ../plugins/gtkui/prefwin.c:348
msgid "You modified the hotkeys settings, but didn't save your changes."
msgstr ""
- #: ../plugins/gtkui/prefwin.c:348
+ #: ../plugins/gtkui/prefwin.c:350
msgid "Are you sure you want to continue without saving?"
msgstr ""
@@@ -1115,7 -1157,7 +1179,7 @@@
msgid "Adding files..."
msgstr "æ£åœ¨åŠ 入檔案..."
- #: ../plugins/gtkui/progress.c:86
+ #: ../plugins/gtkui/progress.c:89
msgid "Initializing..."
msgstr "æ£åœ¨åˆå§‹åŒ–..."
@@@ -1128,139 -1170,141 +1192,151 @@@ msgid "Really close the window?
msgstr "真è¦é—œé–‰è¦–窗？"
#. get value to edit
- #: ../plugins/gtkui/trkproperties.c:289
+ #: ../plugins/gtkui/trkproperties.c:299
msgid "[Multiple values] "
msgstr "[多é‡å€¼] "
++<<<<<<< HEAD
+#: ../plugins/gtkui/trkproperties.c:480 ../plugins/gtkui/trkproperties.c:492
+#: ../plugins/gtkui/widgets.c:2025
+msgid "Key"
+msgstr "按éµ"
+
+#: ../plugins/gtkui/trkproperties.c:481 ../plugins/gtkui/trkproperties.c:493
+#: ../plugins/gtkui/widgets.c:2027
++=======
+ #: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
+ #: ../plugins/gtkui/widgets.c:2200
+ msgid "Key"
+ msgstr "按éµ"
+
+ #: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
+ #: ../plugins/gtkui/widgets.c:2202
++>>>>>>> upstream/0.6.2
msgid "Value"
msgstr "值"
- #: ../plugins/gtkui/trkproperties.c:512
+ #: ../plugins/gtkui/trkproperties.c:522
msgid "[Multiple values]"
- msgstr ""
+ msgstr "[多é‡å€¼]"
- #: ../plugins/gtkui/trkproperties.c:691
+ #: ../plugins/gtkui/trkproperties.c:701
msgid "Writing tags..."
msgstr "æ£åœ¨å¯«å…¥æ¨™è¨˜..."
- #: ../plugins/gtkui/trkproperties.c:720
+ #: ../plugins/gtkui/trkproperties.c:730
msgid "Field name"
- msgstr ""
+ msgstr "欄ä½å稱"
- #: ../plugins/gtkui/trkproperties.c:723
+ #: ../plugins/gtkui/trkproperties.c:733
msgid "Name:"
msgstr "å稱："
- #: ../plugins/gtkui/trkproperties.c:735
+ #: ../plugins/gtkui/trkproperties.c:745
msgid "Field names must not start with : or _"
msgstr "欄ä½å稱ä¸èƒ½ä»¥ : 或 _ 開首"
- #: ../plugins/gtkui/trkproperties.c:736 ../plugins/gtkui/trkproperties.c:775
+ #: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
msgid "Cannot add field"
msgstr "ç„¡æ³•åŠ å…¥æ¬„ä½"
- #: ../plugins/gtkui/trkproperties.c:774
+ #: ../plugins/gtkui/trkproperties.c:784
msgid "Field with such name already exists, please try different name."
msgstr "已有æ¤å稱欄ä½ï¼Œè«‹é¸åˆ¥å€‹ã€‚"
- #: ../plugins/gtkui/trkproperties.c:837
+ #: ../plugins/gtkui/trkproperties.c:847
msgid "Add field"
msgstr "åŠ å…¥æ¬„ä½"
- #: ../plugins/gtkui/trkproperties.c:840
+ #: ../plugins/gtkui/trkproperties.c:850
msgid "Remove field"
msgstr "移除欄ä½"
- #: ../main.c:89
+ #: ../main.c:90
#, c-format
msgid "Usage: deadbeef [options] [--] [file(s)]\n"
- msgstr ""
+ msgstr "使用方法: deadbeef [é¸é …] [--] [檔案(複數)]\n"
- #: ../main.c:90
+ #: ../main.c:91
#, c-format
msgid "Options:\n"
msgstr "é¸é …:\n"
- #: ../main.c:91
+ #: ../main.c:92
#, c-format
msgid " --help or -h Print help (this message) and exit\n"
msgstr " --help 或 -h 顯示說明 (本訊æ¯) 並çµæŸ\n"
- #: ../main.c:92
+ #: ../main.c:93
#, c-format
msgid " --quit Quit player\n"
msgstr " --quit çµæŸæ’放器\n"
- #: ../main.c:93
+ #: ../main.c:94
#, c-format
msgid " --version Print version info and exit\n"
msgstr " --version 顯示版本資料並çµæŸ\n"
- #: ../main.c:94
+ #: ../main.c:95
#, c-format
msgid " --play Start playback\n"
msgstr " --play 開始æ’放\n"
- #: ../main.c:95
+ #: ../main.c:96
#, c-format
msgid " --stop Stop playback\n"
msgstr " --stop åœæ¢æ’放\n"
- #: ../main.c:96
+ #: ../main.c:97
#, c-format
msgid " --pause Pause playback\n"
msgstr " --pause æš«åœæ’放\n"
- #: ../main.c:97
+ #: ../main.c:98
#, c-format
msgid " --toggle-pause Toggle pause\n"
msgstr " --toggle-pause 切æ›æš«åœç‹€æ…‹\n"
- #: ../main.c:98
+ #: ../main.c:99
#, c-format
msgid ""
" --play-pause Start playback if stopped, toggle pause otherwise\n"
msgstr " --play-pause 如åœæ¢å‰‡é–‹å§‹æ’放，å¦å‰‡åˆ‡æ›æš«åœç‹€æ…‹\n"
- #: ../main.c:99
+ #: ../main.c:100
#, c-format
msgid " --next Next song in playlist\n"
msgstr " --next æ’放清單下一首æŒ\n"
- #: ../main.c:100
+ #: ../main.c:101
#, c-format
msgid " --prev Previous song in playlist\n"
msgstr " --prev æ’放清單上一首æŒ\n"
- #: ../main.c:101
+ #: ../main.c:102
#, c-format
msgid " --random Random song in playlist\n"
msgstr " --random æ’放清單隨機æŒæ›²\n"
- #: ../main.c:102
+ #: ../main.c:103
#, c-format
msgid " --queue Append file(s) to existing playlist\n"
msgstr " --queue å°‡æª”æ¡ˆé™„åŠ è‡³æ’放清單\n"
- #: ../main.c:103
+ #: ../main.c:104
#, c-format
msgid ""
" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
msgstr ""
+ " --gui æ“´å…… 告訴程å¼æ‚¨æƒ³ä½¿ç”¨å“ªå€‹åœ–型介é¢æ“´å……, é è¨å€¼æ˜¯ \"GTK2\"\n"
+ "\n"
- #: ../main.c:104
+ #: ../main.c:105
#, c-format
msgid " --nowplaying FMT Print formatted track name to stdout\n"
msgstr " --nowplaying FMT å°‡æ ¼å¼åŒ–çš„æŒæ›²å輸出至 stdout\n"
- #: ../main.c:105
+ #: ../main.c:106
#, c-format
msgid ""
" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@@ -1271,7 -1315,7 +1347,7 @@@ msgstr "
" [l]長度, [n]æŒæ›²ç·¨è™Ÿ, [y]年份, [c]評語,\n"
" [r]版權, [e]å·²éŽæ™‚é–“\n"
- #: ../main.c:108
+ #: ../main.c:109
#, c-format
msgid ""
" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@@ -1280,28 -1324,24 +1356,36 @@@ msgstr "
" 例如: --nowplaying \"%%a - %%t\" 會顯示 \"è—人 - æŒå"
"\"\n"
- #: ../main.c:109
+ #: ../main.c:110
#, c-format
- msgid ""
- " for more info, see http://sourceforge.net/apps/"
- "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+ msgid " for more info, see %s\n"
msgstr ""
- " 更多資料請見 http://sourceforge.net/apps/mediawiki/"
- "deadbeef/index.php?title=Title_Formatting\n"
++<<<<<<< HEAD
+#: ../playlist.c:482 ../playlist.c:2489
+msgid "Default"
+msgstr "é è¨"
+
+#: ../playlist.c:3877
+msgid "Yes"
+msgstr "是"
+
+#: ../playlist.c:3877
++=======
+ #: ../playlist.c:481 ../playlist.c:2557
+ msgid "Default"
+ msgstr "é è¨"
+
+ #: ../playlist.c:3981
+ msgid "Yes"
+ msgstr "是"
+
+ #: ../playlist.c:3981
++>>>>>>> upstream/0.6.2
msgid "No"
msgstr "å¦"
- #: ../plugins/gtkui/deadbeef.glade.h:73
+ #: ../plugins/gtkui/deadbeef.glade.h:74
msgid ""
"Item Index\n"
"Playing\n"
@@@ -1318,7 -1358,7 +1402,7 @@@ msgstr "
"é …ç›®ç´¢å¼•\n"
"æ£åœ¨æ’放專輯å°é¢è—人 - 專輯è—人專輯æŒå長度æŒæ›²ç·¨è™Ÿæ¨‚隊 / 專輯è—人自訂"
- #: ../plugins/gtkui/deadbeef.glade.h:86
+ #: ../plugins/gtkui/deadbeef.glade.h:87
msgid ""
"Left\n"
"Right"
@@@ -1326,7 -1366,7 +1410,7 @@@ msgstr "
"å·¦\n"
"å³"
- #: ../plugins/gtkui/deadbeef.glade.h:94
+ #: ../plugins/gtkui/deadbeef.glade.h:95
msgid ""
"Disable\n"
"Track\n"
@@@ -1335,7 -1375,7 +1419,7 @@@ msgstr "
"åœç”¨\n"
"æŒæ›²å°ˆè¼¯"
- #: ../plugins/gtkui/deadbeef.glade.h:172
+ #: ../plugins/gtkui/deadbeef.glade.h:176
msgid ""
"Ascending\n"
"Descending"
@@@ -1343,7 -1383,7 +1427,7 @@@ msgstr "
"é †åº\n"
"逆åº"
- #: ../plugins/gtkui/deadbeef.glade.h:184
+ #: ../plugins/gtkui/deadbeef.glade.h:188
msgid ""
"2.3 (Recommended)\n"
"2.4"
@@@ -1351,14 -1391,7 +1435,7 @@@ msgstr "
"2.3 (建è°ç‰ˆæœ¬)\n"
"2.4"
- #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
- #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
- #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
- #, c-format
- msgid "Couldn't find pixmap file: %s"
- msgstr "æ‰¾ä¸ pixmap 檔案：%s"
-
- #: ../plugins/wildmidi/wildmidiplug.c:164
+ #: ../plugins/wildmidi/wildmidiplug.c:174
#, c-format
msgid ""
"wildmidi: freepats config file not found. Please install timidity-freepats "
@@@ -1370,7 -1403,7 +1447,7 @@@ msgstr "
#. this file should list extra translatable strings that are not referenced
#. directly in source code, e.g. scripted plugin configuration strings
#: ../translation/extra.c:3
- msgid "Add audio CD"
+ msgid "Add Audio CD"
msgstr ""
#: ../translation/extra.c:4
@@@ -1417,7 -1450,7 +1494,7 @@@ msgstr "Scrobble 網å€
#: ../translation/extra.c:16
msgid "Prefer Album Artist over Artist field"
- msgstr ""
+ msgstr "以專輯作者å–代作者欄"
#. OSS output plugin
#: ../translation/extra.c:18
@@@ -1489,7 -1522,7 +1566,7 @@@ msgstr "é‡å–樣å“質 (0..2，越高è
#: ../translation/extra.c:37
msgid "8-bit output (default is 16)"
- msgstr ""
+ msgstr "8-bit 輸出 (é è¨å€¼æ˜¯ 16)"
#. Game_Music_Emu decoder plugin
#: ../translation/extra.c:39
@@@ -1498,11 -1531,11 +1575,11 @@@ msgstr "æŒæ›²æœ€å¤§é•·åº¦ (分é˜)
#: ../translation/extra.c:40
msgid "Fadeout length (seconds)"
- msgstr ""
+ msgstr "淡出長度 (å–®ä½:秒)"
#: ../translation/extra.c:41
msgid "Play loops nr. of times (if available)"
- msgstr ""
+ msgstr "é‡è¤‡æ’放 æ•¸å— æ¬¡ (若支æ´)"
#. Standard GTK2 user interface plugin
#: ../translation/extra.c:43
@@@ -1655,7 -1688,7 +1732,7 @@@ msgstr "目標å–樣率
#: ../translation/extra.c:94
msgid "Quality / Algorithm"
- msgstr ""
+ msgstr "å“質 / 演算法"
#: ../translation/extra.c:95
msgid "Automatic Samplerate (overrides Target Samplerate)"
@@@ -1663,128 -1696,133 +1740,133 @@@ msgstr "自動å–樣率 (優先於「ç›
#. shellexecui
#: ../translation/extra.c:97
- msgid "Configure custom shell commands"
+ msgid "Configure Custom Shell Commands"
msgstr ""
#. mpgmad
#: ../translation/extra.c:99
msgid "Disable gapless playback (faster scanning)"
- msgstr ""
+ msgstr "å–消無間斷æ’放 (掃瞄更快速)"
#. adplug
#: ../translation/extra.c:101
msgid "Prefer Ken emu over Satoh (surround won't work)"
- msgstr ""
+ msgstr "優先使用 Ken emu å–代 Satoh (環繞音效將無效)"
#: ../translation/extra.c:102
msgid "Enable surround"
+ msgstr "開啟環繞音效"
+
+ #: ../plugins/converter/convgui.c:84
+ #, c-format
+ msgid "[Built-in] %s"
msgstr ""
- #: ../plugins/converter/convgui.c:117
+ #: ../plugins/converter/convgui.c:130
msgid "The file already exists. Overwrite?"
msgstr "已有該檔案。是å¦è¦†å¯«ï¼Ÿ"
- #: ../plugins/converter/convgui.c:119
+ #: ../plugins/converter/convgui.c:132
msgid "Converter warning"
msgstr "轉æ›å™¨è¦å‘Š"
- #: ../plugins/converter/convgui.c:287
+ #: ../plugins/converter/convgui.c:300
msgid "Please select encoder"
msgstr "è«‹é¸å–編碼器"
- #: ../plugins/converter/convgui.c:289
+ #: ../plugins/converter/convgui.c:302
msgid "Converter error"
msgstr "轉æ›å™¨å‡ºéŒ¯"
- #: ../plugins/converter/convgui.c:313
+ #: ../plugins/converter/convgui.c:326
msgid "Converting..."
msgstr "æ£åœ¨è½‰æ›..."
- #: ../plugins/converter/convgui.c:518
+ #: ../plugins/converter/convgui.c:536
msgid "Select folder..."
msgstr "é¸å–資料夾..."
- #: ../plugins/converter/convgui.c:740
+ #: ../plugins/converter/convgui.c:769
msgid "Failed to save encoder preset"
msgstr "未能儲å˜ç·¨ç¢¼å™¨é è¨å€¼"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid ""
"Check preset folder permissions, try to pick different title, or free up "
"some disk space"
msgstr "檢查é è¨å€¼è³‡æ–™å¤¾æ¬Šé™ã€å˜—試æ€é¸å¦ä¸€å€‹æŒå，åˆæˆ–空出一些ç£ç¢Ÿç©ºé–“"
- #: ../plugins/converter/convgui.c:742 ../plugins/converter/convgui.c:1216
+ #: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
msgid "Preset with the same name already exists. Try to pick another title."
msgstr "已有åŒåé è¨å€¼ã€‚è«‹æ€é¸å¦ä¸€å€‹ã€‚"
- #: ../plugins/converter/convgui.c:743 ../plugins/converter/convgui.c:1217
+ #: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
#: ../plugins/gtkui/ctmapping.c:262
msgid "Error"
msgstr "錯誤"
- #: ../plugins/converter/convgui.c:797
+ #: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
msgid "Add new encoder"
msgstr "åŠ å…¥æ–°ç·¨ç¢¼å™¨"
- #: ../plugins/converter/convgui.c:827
+ #: ../plugins/converter/convgui.c:856
msgid "Edit encoder"
msgstr "編輯編碼器"
- #: ../plugins/converter/convgui.c:859 ../plugins/converter/convgui.c:1314
+ #: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
msgid "Remove preset"
msgstr "移除é è¨å€¼"
- #: ../plugins/converter/convgui.c:861 ../plugins/converter/convgui.c:1316
+ #: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
msgid "This action will delete the selected preset. Are you sure?"
msgstr "æ¤èˆ‰æœƒåˆªé™¤æ‰€é¸é è¨å€¼ã€‚確定嗎？"
- #: ../plugins/converter/convgui.c:885
+ #: ../plugins/converter/convgui.c:974
msgid "Encoders"
msgstr "編碼器"
- #: ../plugins/converter/convgui.c:956 ../plugins/gtkui/dspconfig.c:186
+ #: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
msgid "Add plugin to DSP chain"
msgstr "將外掛程å¼åŠ 入至 DSP 連鎖"
- #: ../plugins/converter/convgui.c:1215
+ #: ../plugins/converter/convgui.c:1323
msgid "Failed to save DSP preset"
msgstr "æœªèƒ½å„²å˜ DSP é è¨å€¼"
- #: ../plugins/converter/convgui.c:1279
+ #: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
msgid "New DSP Preset"
msgstr "新增 DSP é è¨å€¼"
- #: ../plugins/converter/convgui.c:1364
+ #: ../plugins/converter/convgui.c:1509
msgid "Edit DSP Preset"
msgstr "編輯 DSP é è¨å€¼"
- #: ../plugins/converter/convgui.c:1384
+ #: ../plugins/converter/convgui.c:1529
msgid "DSP Presets"
msgstr "DSP é è¨å€¼"
- #: ../plugins/converter/interface.c:92
+ #: ../plugins/converter/interface.c:93
#: ../plugins/converter/converter.glade.h:1
msgid "Output folder:"
msgstr "輸出資料夾："
- #: ../plugins/converter/interface.c:109
+ #: ../plugins/converter/interface.c:110
#: ../plugins/converter/converter.glade.h:2
msgid "Write to source track folder"
- msgstr ""
+ msgstr "寫入來æºæ›²ç›®è³‡æ–™å¤¾"
- #: ../plugins/converter/interface.c:113
+ #: ../plugins/converter/interface.c:114
#: ../plugins/converter/converter.glade.h:3
msgid "Preserve folder structure"
- msgstr ""
+ msgstr "ä¿æŒè³‡æ–™å¤¾çµæ§‹"
- #: ../plugins/converter/interface.c:121
+ #: ../plugins/converter/interface.c:122
#: ../plugins/converter/converter.glade.h:4
msgid "Output file name:"
msgstr "輸出檔案å稱："
- #: ../plugins/converter/interface.c:132
+ #: ../plugins/converter/interface.c:133
#: ../plugins/converter/converter.glade.h:6
#, no-c-format
msgid ""
@@@ -1794,89 -1832,89 +1876,89 @@@ msgstr "
"æœƒè‡ªå‹•åŠ ä¸Šå‰¯æª”å (例如 .mp3)。\n"
"留空使用é è¨å€¼ (%a - %t)。"
- #: ../plugins/converter/interface.c:145
+ #: ../plugins/converter/interface.c:146
#: ../plugins/converter/converter.glade.h:8
msgid "Encoder:"
msgstr "編碼器："
- #: ../plugins/converter/interface.c:169
+ #: ../plugins/converter/interface.c:170
#: ../plugins/converter/converter.glade.h:9
msgid "DSP preset:"
msgstr "DSP é è¨å€¼ï¼š"
- #: ../plugins/converter/interface.c:192
+ #: ../plugins/converter/interface.c:193
#: ../plugins/converter/converter.glade.h:10
msgid "Number of threads:"
msgstr "線程數目："
- #: ../plugins/converter/interface.c:205
+ #: ../plugins/converter/interface.c:206
#: ../plugins/converter/converter.glade.h:11
msgid "Output sample format:"
msgstr "輸出å–æ¨£æ ¼å¼ï¼š"
- #: ../plugins/converter/interface.c:212
+ #: ../plugins/converter/interface.c:213
msgid "Keep source format"
msgstr "ä¿æŒä¾†æºæ ¼å¼"
- #: ../plugins/converter/interface.c:213
+ #: ../plugins/converter/interface.c:214
msgid "8 bit signed int"
msgstr "8 ä½å…ƒå¸¶æ£è² 整數"
- #: ../plugins/converter/interface.c:214
+ #: ../plugins/converter/interface.c:215
msgid "16 bit signed int"
msgstr "16 ä½å…ƒå¸¶æ£è² 整數"
- #: ../plugins/converter/interface.c:215
+ #: ../plugins/converter/interface.c:216
msgid "24 bit signed int"
msgstr "24 ä½å…ƒå¸¶æ£è² 整數"
- #: ../plugins/converter/interface.c:216
+ #: ../plugins/converter/interface.c:217
msgid "32 bit signed int"
msgstr "32 ä½å…ƒå¸¶æ£è² 整數"
- #: ../plugins/converter/interface.c:217
+ #: ../plugins/converter/interface.c:218
msgid "32 bit float"
msgstr "32 ä½å…ƒæµ®é»žæ•¸"
- #: ../plugins/converter/interface.c:223
+ #: ../plugins/converter/interface.c:224
#: ../plugins/converter/converter.glade.h:18
msgid "When file exists:"
msgstr "當有æ¤æª”案："
- #: ../plugins/converter/interface.c:230
+ #: ../plugins/converter/interface.c:231
msgid "Prompt"
msgstr "æ示"
- #: ../plugins/converter/interface.c:231
+ #: ../plugins/converter/interface.c:232
msgid "Overwrite"
msgstr "覆寫"
- #: ../plugins/converter/interface.c:362
+ #: ../plugins/converter/interface.c:363
#: ../plugins/converter/converter.glade.h:21
msgid "Edit Encoder Preset"
msgstr "編輯編碼器é è¨å€¼"
- #: ../plugins/converter/interface.c:385
+ #: ../plugins/converter/interface.c:386
#: ../plugins/converter/converter.glade.h:23
msgid "Untitled Encoder"
msgstr "未命å編碼器"
- #: ../plugins/converter/interface.c:393
+ #: ../plugins/converter/interface.c:394
#: ../plugins/converter/converter.glade.h:24
msgid "Output file extension:"
msgstr "輸出檔案副檔å："
- #: ../plugins/converter/interface.c:400
+ #: ../plugins/converter/interface.c:401
#: ../plugins/converter/converter.glade.h:25
msgid "E.g. mp3"
msgstr "例如 mp3"
- #: ../plugins/converter/interface.c:408
+ #: ../plugins/converter/interface.c:409
#: ../plugins/converter/converter.glade.h:26
msgid "Command line:"
msgstr "指令列："
- #: ../plugins/converter/interface.c:419
+ #: ../plugins/converter/interface.c:420
#: ../plugins/converter/converter.glade.h:28
#, no-c-format
msgid ""
@@@ -1886,7 -1924,7 +1968,7 @@@ msgstr "
"例如: lame - %o\n"
"%i 為輸入檔案ã€%o 為輸出檔案ã€- 為 stdin"
- #: ../plugins/converter/interface.c:429
+ #: ../plugins/converter/interface.c:430
#: ../plugins/converter/converter.glade.h:31
#, no-c-format
msgid ""
@@@ -1896,66 -1934,72 +1978,72 @@@ msgstr "
"<small>%o - 輸出檔案å稱\n"
"%i - 臨時輸入檔案å稱</small>"
- #: ../plugins/converter/interface.c:438
+ #: ../plugins/converter/interface.c:439
#: ../plugins/converter/converter.glade.h:33
msgid "Method:"
msgstr "方法："
- #: ../plugins/converter/interface.c:445
+ #: ../plugins/converter/interface.c:446
msgid "Pipe"
msgstr "管線"
- #: ../plugins/converter/interface.c:446
+ #: ../plugins/converter/interface.c:447
msgid "Temporary file"
msgstr "臨時檔案"
- #: ../plugins/converter/interface.c:463
+ #: ../plugins/converter/interface.c:464
#: ../plugins/converter/converter.glade.h:36
msgid "APEv2"
msgstr "APEv2"
- #: ../plugins/converter/interface.c:469
+ #: ../plugins/converter/interface.c:470
#: ../plugins/converter/converter.glade.h:37
msgid "ID3v1"
msgstr "ID3v1"
- #: ../plugins/converter/interface.c:475
+ #: ../plugins/converter/interface.c:476
#: ../plugins/converter/converter.glade.h:38
msgid "OggVorbis"
msgstr "OggVorbis"
- #: ../plugins/converter/interface.c:481
+ #: ../plugins/converter/interface.c:482
#: ../plugins/converter/converter.glade.h:39
msgid "FLAC"
msgstr "FLAC"
- #: ../plugins/converter/interface.c:493
+ #: ../plugins/converter/interface.c:494
#: ../plugins/converter/converter.glade.h:40
msgid "ID3v2"
msgstr "ID3v2"
- #: ../plugins/converter/interface.c:503
+ #: ../plugins/converter/interface.c:504
#: ../plugins/converter/converter.glade.h:41
msgid "<b>Tag writer</b>"
msgstr "<b>標記寫入器</b>"
- #: ../plugins/converter/interface.c:589
+ #: ../plugins/converter/interface.c:590
#: ../plugins/converter/converter.glade.h:42
msgid "DSP Preset Editor"
msgstr "DSP é è¨å€¼ç·¨è¼¯"
- #: ../plugins/converter/interface.c:612
+ #: ../plugins/converter/interface.c:613
#: ../plugins/converter/converter.glade.h:44
msgid "Untitled DSP Preset"
msgstr "未命å DSP é è¨å€¼"
- #: ../plugins/converter/interface.c:624
+ #: ../plugins/converter/interface.c:625
#: ../plugins/converter/converter.glade.h:45
- #: ../plugins/shellexecui/interface.c:61
+ #: ../plugins/shellexecui/interface.c:62
#: ../plugins/shellexecui/shellexec.glade.h:3
msgid "Add"
msgstr "åŠ å…¥"
+ #: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+ #: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+ #, c-format
+ msgid "Couldn't find pixmap file: %s"
+ msgstr "æ‰¾ä¸ pixmap 檔案：%s"
+
#: ../plugins/converter/converter.glade.h:12
msgid ""
"Keep source format\n"
@@@ -1965,45 -2009,55 +2053,55 @@@
"32 bit signed int\n"
"32 bit float"
msgstr ""
+ "ä¿æŒä¾†æºæ ¼å¼\n"
+ "8 bit signed int\n"
+ "16 bit signed int\n"
+ "24 bit signed int\n"
+ "32 bit signed int\n"
+ "32 bit float"
#: ../plugins/converter/converter.glade.h:19
msgid ""
"Prompt\n"
"Overwrite"
msgstr ""
+ "立刻\n"
+ "覆寫"
#: ../plugins/converter/converter.glade.h:34
msgid ""
"Pipe\n"
"Temporary file"
msgstr ""
+ "管é“\n"
+ "臨時檔案"
#: ../plugins/shellexecui/interface.c:46
#: ../plugins/shellexecui/shellexec.glade.h:1
msgid "Custom Shell Commands"
- msgstr ""
+ msgstr "自訂 Shell 指令"
- #: ../plugins/shellexecui/interface.c:69
+ #: ../plugins/shellexecui/interface.c:70
#: ../plugins/shellexecui/shellexec.glade.h:5
msgid "Edit"
- msgstr ""
+ msgstr "編輯(_E)"
- #: ../plugins/shellexecui/interface.c:87
+ #: ../plugins/shellexecui/interface.c:88
#: ../plugins/shellexecui/shellexec.glade.h:2
msgid "Close"
- msgstr ""
+ msgstr "關閉(_C)"
- #: ../plugins/shellexecui/interface.c:145
+ #: ../plugins/shellexecui/interface.c:149
#: ../plugins/shellexecui/shellexec.glade.h:6
msgid "Edit Command"
- msgstr ""
+ msgstr "編輯指令"
- #: ../plugins/shellexecui/interface.c:166
+ #: ../plugins/shellexecui/interface.c:170
#: ../plugins/shellexecui/shellexec.glade.h:8
msgid "Command:"
- msgstr ""
+ msgstr "指令: "
- #: ../plugins/shellexecui/interface.c:178
+ #: ../plugins/shellexecui/interface.c:182
#: ../plugins/shellexecui/shellexec.glade.h:10
#, no-c-format
msgid ""
@@@ -2012,74 -2066,74 +2110,74 @@@
"xdg-open %D"
msgstr ""
- #: ../plugins/shellexecui/interface.c:181
+ #: ../plugins/shellexecui/interface.c:185
#: ../plugins/shellexecui/shellexec.glade.h:11
msgid "ID:"
- msgstr ""
+ msgstr "ID:"
- #: ../plugins/shellexecui/interface.c:193
+ #: ../plugins/shellexecui/interface.c:197
#: ../plugins/shellexecui/shellexec.glade.h:12
msgid "Free-form name, for example \"My Shell Command\""
msgstr ""
- #: ../plugins/shellexecui/interface.c:201
+ #: ../plugins/shellexecui/interface.c:205
#: ../plugins/shellexecui/shellexec.glade.h:13
msgid ""
"Command ID, normally it should be something short, for example \"youtube_open"
"\". It must be unique."
msgstr ""
- #: ../plugins/shellexecui/interface.c:204
+ #: ../plugins/shellexecui/interface.c:208
#: ../plugins/shellexecui/shellexec.glade.h:15
msgid "Single Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:207
+ #: ../plugins/shellexecui/interface.c:211
#: ../plugins/shellexecui/shellexec.glade.h:14
msgid "Works on single track."
msgstr ""
- #: ../plugins/shellexecui/interface.c:209
+ #: ../plugins/shellexecui/interface.c:213
#: ../plugins/shellexecui/shellexec.glade.h:17
msgid "Multiple Tracks"
msgstr ""
- #: ../plugins/shellexecui/interface.c:212
+ #: ../plugins/shellexecui/interface.c:216
#: ../plugins/shellexecui/shellexec.glade.h:16
msgid "Works on multiple tracks."
msgstr ""
- #: ../plugins/shellexecui/interface.c:214
+ #: ../plugins/shellexecui/interface.c:218
#: ../plugins/shellexecui/shellexec.glade.h:19
msgid "Local"
msgstr ""
- #: ../plugins/shellexecui/interface.c:217
+ #: ../plugins/shellexecui/interface.c:221
#: ../plugins/shellexecui/shellexec.glade.h:18
msgid "Works on local files."
msgstr ""
- #: ../plugins/shellexecui/interface.c:219
+ #: ../plugins/shellexecui/interface.c:223
#: ../plugins/shellexecui/shellexec.glade.h:21
msgid "Remote"
msgstr ""
- #: ../plugins/shellexecui/interface.c:222
+ #: ../plugins/shellexecui/interface.c:226
#: ../plugins/shellexecui/shellexec.glade.h:20
msgid "Works on remote files (e.g. http:// streams)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:224
+ #: ../plugins/shellexecui/interface.c:228
#: ../plugins/shellexecui/shellexec.glade.h:23
msgid "Generic (Main Menu)"
msgstr ""
- #: ../plugins/shellexecui/interface.c:227
+ #: ../plugins/shellexecui/interface.c:231
#: ../plugins/shellexecui/shellexec.glade.h:22
msgid "Item should appear in the main menu"
msgstr ""
- #: ../plugins/shellexecui/interface.c:229
+ #: ../plugins/shellexecui/interface.c:233
#: ../plugins/shellexecui/shellexec.glade.h:24
msgid ""
"<small>If you want to add the command to main menu, make sure that title "
@@@ -2087,90 -2141,90 +2185,94 @@@
"menu name in the English version.</small>"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:94
+ #: ../plugins/shellexecui/shellexecui.c:96
msgid "Add Command"
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/shellexecui/shellexecui.c:137 ../plugins/gtkui/widgets.c:619
++=======
+ #: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
++>>>>>>> upstream/0.6.2
msgid "Delete"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:139
+ #: ../plugins/shellexecui/shellexecui.c:141
msgid "This action will delete the selected shell command. Are you sure?"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:141
+ #: ../plugins/shellexecui/shellexecui.c:143
msgid "Confirm Remove"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:227
+ #: ../plugins/shellexecui/shellexecui.c:229
msgid "ID must be non-empty and unique.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:233
+ #: ../plugins/shellexecui/shellexecui.c:235
msgid "Title must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:239
+ #: ../plugins/shellexecui/shellexecui.c:241
msgid "Shell Command must be non-empty.\n"
msgstr ""
- #: ../plugins/shellexecui/shellexecui.c:246
- #: ../plugins/shellexecui/shellexecui.c:250
+ #: ../plugins/shellexecui/shellexecui.c:248
+ #: ../plugins/shellexecui/shellexecui.c:252
msgid "Invalid Values"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:108
+ #: ../plugins/gtkui/actionhandlers.c:112
msgid "Supported sound formats"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:119
+ #: ../plugins/gtkui/actionhandlers.c:123
msgid "All files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:127
+ #: ../plugins/gtkui/actionhandlers.c:131
msgid "Open file(s)..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:166
+ #: ../plugins/gtkui/actionhandlers.c:170
msgid "Add file(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:212
+ #: ../plugins/gtkui/actionhandlers.c:216
msgid "Add folder(s) to playlist..."
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:217
+ #: ../plugins/gtkui/actionhandlers.c:221
msgid "Follow symlinks"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:429
+ #: ../plugins/gtkui/actionhandlers.c:475
msgid "help.txt"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:489
+ #: ../plugins/gtkui/actionhandlers.c:548
msgid "Delete files from disk"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:490
+ #: ../plugins/gtkui/actionhandlers.c:549
msgid ""
"Files will be lost. Proceed?\n"
"(This dialog can be turned off in GTKUI plugin settings)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:673
+ #: ../plugins/gtkui/actionhandlers.c:726
msgid "Load Playlist"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:688
+ #: ../plugins/gtkui/actionhandlers.c:741
msgid "Other files (*)"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:722
+ #: ../plugins/gtkui/actionhandlers.c:775
msgid "Save Playlist As"
msgstr ""
- #: ../plugins/gtkui/actionhandlers.c:733
+ #: ../plugins/gtkui/actionhandlers.c:786
msgid "DeaDBeeF playlist files (*.dbpl)"
msgstr ""
@@@ -2197,102 -2251,111 +2299,187 @@@ msgstr "
msgid "Nothing is selected."
msgstr ""
++<<<<<<< HEAD
+#: ../plugins/gtkui/widgets.c:594
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:599
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:626
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:633
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:640
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:764
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1071
+msgid "Lock movement"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1356
+msgid "Move tab left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1363
+msgid "Move tab right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1370
+msgid "Remove tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1377
+msgid "Rename tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1438
+msgid "Add new tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1861
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2969
+msgid "Expand the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2974
+msgid "Shrink the box by 1 item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2979
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3019
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3027
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3428
++=======
+ #: ../plugins/gtkui/widgets.c:444
+ #, c-format
+ msgid "Widget \"%s\" is not available"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:772
+ msgid "Replace with..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:777
+ msgid "Insert..."
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:804
+ msgid "Cut"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:811
+ msgid "Copy"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:818
+ msgid "Paste"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:942
+ msgid "Multiple widgets of this type are not supported"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1249
+ msgid "Lock movement"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1534
+ msgid "Move tab left"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1541
+ msgid "Move tab right"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1548
+ msgid "Remove tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1555
+ msgid "Rename tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:1616
+ msgid "Add new tab"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:2036
+ msgid "Show Column Headers"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3147
+ msgid "Expand the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3152
+ msgid "Shrink the box by 1 item"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3157
+ msgid "Homogeneous"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3197
+ msgid "Expand"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3205
+ msgid "Fill"
+ msgstr ""
+
+ #: ../plugins/gtkui/widgets.c:3606
++>>>>>>> upstream/0.6.2
msgid "Configure button"
msgstr ""
+ #: ../plugins/gtkui/widgets.c:3870
+ msgid "Voices:"
+ msgstr ""
+
#: ../plugins/gtkui/pltmenu.c:62
msgid "Edit playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:258
+ #: ../plugins/gtkui/pltmenu.c:265
msgid "Rename Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:265
+ #: ../plugins/gtkui/pltmenu.c:272
msgid "Remove Playlist"
msgstr ""
- #: ../plugins/gtkui/pltmenu.c:272
+ #: ../plugins/gtkui/pltmenu.c:279
msgid "Add New Playlist"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:225
+ #: ../plugins/pltbrowser/pltbrowser.c:213
msgid "Name"
msgstr ""
- #: ../plugins/pltbrowser/pltbrowser.c:251
+ #: ../plugins/pltbrowser/pltbrowser.c:238
msgid "Playlist browser"
msgstr ""
--
deadbeef packaging
More information about the pkg-multimedia-commits
mailing list